clean up cruft

Package-Manager: portage-2.0.51.19

18 files changed, 41 insertions, 3182 deletions

diff --git a/net-fs/samba/ChangeLog b/net-fs/samba/ChangeLog
index a2d5a690ca2c..7a97e160b425 100644
--- a/net-fs/samba/ChangeLog
+++ b/net-fs/samba/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-fs/samba
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-fs/samba/ChangeLog,v 1.158 2005/04/04 08:46:30 satya Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-fs/samba/ChangeLog,v 1.159 2005/04/13 11:43:46 seemant Exp $
+
+  13 Apr 2005; Seemant Kulleen <seemant@gentoo.org> -samba-3.0.6-r3.ebuild,
+  -samba-3.0.6-r4.ebuild, -samba-3.0.7.ebuild, -samba-3.0.7-r1.ebuild,
+  -samba-3.0.8.ebuild, -samba-3.0.8-r1.ebuild, -samba-3.0.9.ebuild,
+  -samba-3.0.9-r1.ebuild:
+  clean up cruft
 
   04 Apr 2005; Christian Andreetta <satya@gentoo.org> samba-3.0.12.ebuild:
   warning on acl and win 9x/Me as per bug #87583
diff --git a/net-fs/samba/Manifest b/net-fs/samba/Manifest
index 745fcb0d9264..991f8578427f 100644
--- a/net-fs/samba/Manifest
+++ b/net-fs/samba/Manifest
@@ -1,63 +1,47 @@
-MD5 998e5fa677027d5f9c34c6e11a2f2300 samba-3.0.7.ebuild 13959
-MD5 752029d2b65f2faafedafcbc8f74c0cb samba-3.0.7-r1.ebuild 15430
-MD5 a099bbaec41e1bf990ab5b7986ce4cf1 samba-3.0.6-r4.ebuild 14235
-MD5 04e7264e5dfee95a35bc59578942b380 samba-3.0.11.ebuild 16532
-MD5 0f3d8c9bb836841be55e78eadd0ea0b7 samba-3.0.9.ebuild 16226
-MD5 dde473d4519c83ca5e81ce51466117f2 samba-3.0.13.ebuild 15542
-MD5 636cefb79b33da2114659a179850f094 samba-3.0.6-r3.ebuild 14258
-MD5 7b437485608a9d4133c07e606ab9fda8 samba-3.0.9-r1.ebuild 16411
-MD5 4ec9fc723b0d9801152c2ddfd4442de9 samba-3.0.10.ebuild 16380
-MD5 8df69d51a4a13d38c421f32cbf82d2a6 samba-3.0.8.ebuild 16847
-MD5 d408ef3cb13932090c85d8effd988468 ChangeLog 27761
+MD5 630eff64196f3aaf3e1872a9132e183b ChangeLog 28022
 MD5 41299f246433a1a55c8fccc77ccd709e metadata.xml 491
+MD5 04e7264e5dfee95a35bc59578942b380 samba-3.0.11.ebuild 16532
 MD5 b274c48ba2f4664b815cba907b13eb08 samba-3.0.12.ebuild 15718
-MD5 e561c6780260096813f060bcbd96b61f samba-3.0.8-r1.ebuild 17161
-MD5 fcebd975211fecf647f6cecf26ba5c96 files/samba-3.0.4.patch 8086
+MD5 4ec9fc723b0d9801152c2ddfd4442de9 samba-3.0.10.ebuild 16380
+MD5 dde473d4519c83ca5e81ce51466117f2 samba-3.0.13.ebuild 15542
+MD5 fd2382184b6a07e63cb07ff26b578fd2 files/config-svc-smbd+nmbd 784
 MD5 fa1dcd2c95a81c22c2ad68de6698a85e files/digest-samba-3.0.10 206
 MD5 5cb8bfa14396777d6e3b69975cf7e181 files/digest-samba-3.0.11 204
-MD5 30021657434000c4ef3bf62872367ea7 files/digest-samba-3.0.12 136
-MD5 b2d8f41a9dad89b3e073259680a517cf files/digest-samba-3.0.13 136
-MD5 e89b19f1e62e257cbaa23a44a0362a58 files/swat.xinetd 527
-MD5 def157a63ec14450df82373617c7dc4b files/samba-3.0.11-gcc4.patch 485
-MD5 a7cc90ba23d86b1d90f65645826dde19 files/smbldap_conf.pm 7095
-MD5 cbaa5a39d9bd67b13f8131b426a4256b files/samba-2.2.5-gp-reloc-fix.patch 431
-MD5 e17a1638ad9f30f2e39db4c8981a2fcd files/vscan-0.3.5-libclamav.patch 523
-MD5 7ee5edc70bf80888c776f5808f865996 files/nsswitch.conf-wins 392
-MD5 341521b710d02d57a70acd49b1d4c06b files/samba-conf 1291
-MD5 4911565359fa56d39c1f69be84c6f22d files/samba-init 1102
-MD5 b836e258befae9d6c66cb3f158769b25 files/samba-3.0.x-libdirsymlink.patch 592
-MD5 fd2382184b6a07e63cb07ff26b578fd2 files/config-svc-smbd+nmbd 784
-MD5 e5dbea6345ee39a97bc8783f5772bf49 files/samba-3.0.6-winbind_getpwnam_v1.patch 2521
+MD5 519576a9448b86f1a7baab18204533a5 files/lmhosts 126
 MD5 f402c2c4103f4c13ac3cc5fa165940db files/nonroot-bind.diff 757
 MD5 5d3129a0f6bcbec6ec91d217881a34e1 files/nsswitch.conf-winbind 298
-MD5 519576a9448b86f1a7baab18204533a5 files/lmhosts 126
+MD5 7ee5edc70bf80888c776f5808f865996 files/nsswitch.conf-wins 392
+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 516ca38dfc67b7cd7356f93ad2cf75b9 files/samba-3.0.0-python-setup.patch 767
+MD5 990fe15ff8a0e79f39069fff6475536d files/samba-3.0.2a-smbprint.patch 1224
+MD5 de43ff30dd5f1431590fd62a997e71b4 files/samba-3.0.4-python-setup.patch 833
+MD5 fcebd975211fecf647f6cecf26ba5c96 files/samba-3.0.4.patch 8086
+MD5 579303048a39e504238ff8e658413452 files/samba-3.0.6-homes-reuse_v2.patch 2411
+MD5 b836e258befae9d6c66cb3f158769b25 files/samba-3.0.6-libdirsymlink.patch 592
+MD5 bf268fdddc8ef677b6fa78661a094eac files/samba-3.0.6-samba.schema 16044
+MD5 e5dbea6345ee39a97bc8783f5772bf49 files/samba-3.0.6-winbind_getpwnam_v1.patch 2521
+MD5 4b541de7c65bbbb129d2522d821b4609 files/samba-3.0.8-lanman.patch 472
+MD5 48bea6e2bb73a2b7ce286bedefae3011 files/samba-3.0.9-util.c-bitpmap.c-4120.patch 1872
+MD5 b836e258befae9d6c66cb3f158769b25 files/samba-3.0.x-libdirsymlink.patch 592
 MD5 e75c2316eced1d80cb2161848581c6a3 files/samba-3.0.x-python-setup.patch 1094
-MD5 1eec486ab39a239e25a76b16a6fcd460 files/smb.conf.example 16183
-MD5 6b6683448cdc01d013bd2c61b4ed8e1e files/samba-slapd-include.conf 499
-MD5 60e527174c1b2c53126dbbedb3cae0f7 files/samba-2.2.8-statfs.patch 209
-MD5 a6cb7ea67d2a4fa00cb2d5dba0710cc3 files/digest-samba-3.0.7 203
-MD5 66e68bb6d3ceb275479b3c68e7becf9d files/digest-samba-3.0.8 203
-MD5 afb788b7b2370ba7045b8d7d7ba8b11a files/digest-samba-3.0.9 205
 MD5 8ea7b443dd580aaaaf7e9e896eba54f2 files/samba-3.0.x-smbumount-uid32.patch 425
+MD5 fcebd975211fecf647f6cecf26ba5c96 files/samba-3.0.x.patch 8086
+MD5 341521b710d02d57a70acd49b1d4c06b files/samba-conf 1291
+MD5 4911565359fa56d39c1f69be84c6f22d files/samba-init 1102
+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 bf268fdddc8ef677b6fa78661a094eac files/samba.schema 16044
+MD5 1eec486ab39a239e25a76b16a6fcd460 files/smb.conf.example 16183
 MD5 239ef0e21552896faeef21c685561245 files/smb.conf.example-samba3.gz 7808
-MD5 bf268fdddc8ef677b6fa78661a094eac files/samba-3.0.6-samba.schema 16044
-MD5 8c114eb3ebe56e7adb7db9381bea62db files/digest-samba-3.0.6-r3 203
-MD5 8c114eb3ebe56e7adb7db9381bea62db files/digest-samba-3.0.6-r4 203
-MD5 a6cb7ea67d2a4fa00cb2d5dba0710cc3 files/digest-samba-3.0.7-r1 203
-MD5 94d8eb813ea041a79ee00914c5052b3f files/digest-samba-3.0.8-r1 205
-MD5 5933e87f1c72bc7a29a1ea4073b49441 files/digest-samba-3.0.9-r1 284
-MD5 9560b7e29d3a65db029fc1800e84abcc files/samba-pdb_ldap-exop.patch 3921
+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 4b541de7c65bbbb129d2522d821b4609 files/samba-3.0.8-lanman.patch 472
-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 6acf6a5e92ff2cfc5f09b88f5d01b63e files/samba-svc 975
-MD5 b6cdc1468e45f92f19873e0c6c5b6e94 files/samba.pam 332
-MD5 48bea6e2bb73a2b7ce286bedefae3011 files/samba-3.0.9-util.c-bitpmap.c-4120.patch 1872
-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
+MD5 e17a1638ad9f30f2e39db4c8981a2fcd files/vscan-0.3.5-libclamav.patch 523
+MD5 def157a63ec14450df82373617c7dc4b files/samba-3.0.11-gcc4.patch 485
+MD5 30021657434000c4ef3bf62872367ea7 files/digest-samba-3.0.12 136
+MD5 b2d8f41a9dad89b3e073259680a517cf files/digest-samba-3.0.13 136
diff --git a/net-fs/samba/files/digest-samba-3.0.6-r3 b/net-fs/samba/files/digest-samba-3.0.6-r3
deleted file mode 100644
index b8cb9655072d..000000000000
--- a/net-fs/samba/files/digest-samba-3.0.6-r3
+++ /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 998ece1ac96680d75cebe6f0352f56b9 smbldap-tools-0.8.5.tgz 271436
diff --git a/net-fs/samba/files/digest-samba-3.0.6-r4 b/net-fs/samba/files/digest-samba-3.0.6-r4
deleted file mode 100644
index b8cb9655072d..000000000000
--- a/net-fs/samba/files/digest-samba-3.0.6-r4
+++ /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 998ece1ac96680d75cebe6f0352f56b9 smbldap-tools-0.8.5.tgz 271436
diff --git a/net-fs/samba/files/digest-samba-3.0.7 b/net-fs/samba/files/digest-samba-3.0.7
deleted file mode 100644
index 09d0212c5614..000000000000
--- a/net-fs/samba/files/digest-samba-3.0.7
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 5906341429e64214909865a4be92e4ab samba-3.0.7.tar.gz 15012667
-MD5 5f173d549014985d681478897135915b samba-vscan-0.3.5.tar.bz2 161982
-MD5 998ece1ac96680d75cebe6f0352f56b9 smbldap-tools-0.8.5.tgz 271436
diff --git a/net-fs/samba/files/digest-samba-3.0.7-r1 b/net-fs/samba/files/digest-samba-3.0.7-r1
deleted file mode 100644
index 09d0212c5614..000000000000
--- a/net-fs/samba/files/digest-samba-3.0.7-r1
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 5906341429e64214909865a4be92e4ab samba-3.0.7.tar.gz 15012667
-MD5 5f173d549014985d681478897135915b samba-vscan-0.3.5.tar.bz2 161982
-MD5 998ece1ac96680d75cebe6f0352f56b9 smbldap-tools-0.8.5.tgz 271436
diff --git a/net-fs/samba/files/digest-samba-3.0.8 b/net-fs/samba/files/digest-samba-3.0.8
deleted file mode 100644
index 14c7f5bfbbfd..000000000000
--- a/net-fs/samba/files/digest-samba-3.0.8
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 7088483c858ac362d302acc0c2a1d431 samba-3.0.8.tar.gz 15101353
-MD5 5f173d549014985d681478897135915b samba-vscan-0.3.5.tar.bz2 161982
-MD5 998ece1ac96680d75cebe6f0352f56b9 smbldap-tools-0.8.5.tgz 271436
diff --git a/net-fs/samba/files/digest-samba-3.0.8-r1 b/net-fs/samba/files/digest-samba-3.0.8-r1
deleted file mode 100644
index 6adcfec46697..000000000000
--- a/net-fs/samba/files/digest-samba-3.0.8-r1
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 7088483c858ac362d302acc0c2a1d431 samba-3.0.8.tar.gz 15101353
-MD5 5f173d549014985d681478897135915b samba-vscan-0.3.5.tar.bz2 161982
-MD5 63abfa7c522c8fb37e1d2e2fb9d422ab smbldap-tools-0.8.5-3.tgz 275520
diff --git a/net-fs/samba/files/digest-samba-3.0.9 b/net-fs/samba/files/digest-samba-3.0.9
deleted file mode 100644
index 55d68eb53c27..000000000000
--- a/net-fs/samba/files/digest-samba-3.0.9
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 9cf2bcef71509a81687dec8732545400 samba-3.0.9.tar.gz 15172821
-MD5 5f173d549014985d681478897135915b samba-vscan-0.3.5.tar.bz2 161982
-MD5 63abfa7c522c8fb37e1d2e2fb9d422ab smbldap-tools-0.8.5-3.tgz 275520
diff --git a/net-fs/samba/files/digest-samba-3.0.9-r1 b/net-fs/samba/files/digest-samba-3.0.9-r1
deleted file mode 100644
index d2d7a20b9271..000000000000
--- a/net-fs/samba/files/digest-samba-3.0.9-r1
+++ /dev/null
@@ -1,4 +0,0 @@
-MD5 9cf2bcef71509a81687dec8732545400 samba-3.0.9.tar.gz 15172821
-MD5 d58ab9466d80c901c11e66435500ea33 samba-3.0.9-CAN-2004-1154.patch.bz2 68999
-MD5 5f173d549014985d681478897135915b samba-vscan-0.3.5.tar.bz2 161982
-MD5 63abfa7c522c8fb37e1d2e2fb9d422ab smbldap-tools-0.8.5-3.tgz 275520
diff --git a/net-fs/samba/samba-3.0.6-r3.ebuild b/net-fs/samba/samba-3.0.6-r3.ebuild
deleted file mode 100644
index d40948124632..000000000000
--- a/net-fs/samba/samba-3.0.6-r3.ebuild
+++ /dev/null
@@ -1,375 +0,0 @@
-# Copyright 1999-2005 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-r3.ebuild,v 1.7 2005/01/09 11:24:33 swegener 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
-#   should be: KEYWORDS="~arm ~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
-KEYWORDS="~arm ~mips sparc ~x86"
-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
-	#samba 3.0.6: bugs 61055 and 62476 -------------------------------------
-	cd ${S}/source || die
-	epatch ${FILESDIR}/samba-3.0.6-homes-reuse_v2.patch || die
-	epatch ${FILESDIR}/samba-3.0.6-winbind_getpwnam_v1.patch || die
-	cp ${FILESDIR}/samba-3.0.6-samba.schema ${S}/examples/LDAP/samba.schema
-	cd ${S} || die
-	# 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.gz smb.conf.example.gz
-	doins ${FILESDIR}/lmhosts
-	#doins ${FILESDIR}/recycle.conf #obsolete: see bug #68315
-	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/share/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-r4.ebuild b/net-fs/samba/samba-3.0.6-r4.ebuild
deleted file mode 100644
index bb29a6e2a377..000000000000
--- a/net-fs/samba/samba-3.0.6-r4.ebuild
+++ /dev/null
@@ -1,371 +0,0 @@
-# Copyright 1999-2005 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-r4.ebuild,v 1.16 2005/01/09 11:24:33 swegener Exp $
-
-inherit eutils flag-o-matic
-
-IUSE="kerberos mysql postgres xml xml2 acl cups ldap pam readline python doc"
-IUSE="${IUSE} oav selinux"
-
-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
-#selinux: bug #62907
-RDEPEND="ldap? ( dev-perl/perl-ldap ) ${_COMMON_DEPS}
-	selinux? ( sec-policy/selinux-samba )"
-
-LICENSE="GPL-2"
-SLOT="0"
-# some archs are removed due to dependency tree integrity for ldap and
-#   dev-perl/Crypt-SmbHash flags
-#   should be: KEYWORDS="~arm ~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
-KEYWORDS="alpha ~amd64 arm hppa ia64 ~mips ppc sparc x86"
-
-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
-	#samba 3.0.6: bugs 61055 and 62476 -------------------------------------
-	cd ${S}/source || die
-	epatch ${FILESDIR}/samba-3.0.6-homes-reuse_v2.patch || die
-	epatch ${FILESDIR}/samba-3.0.6-winbind_getpwnam_v1.patch || die
-	cp ${FILESDIR}/samba-3.0.6-samba.schema ${S}/examples/LDAP/samba.schema
-	cd ${S} || die
-	use amd64 && epatch ${FILESDIR}/${P}-libdirsymlink.patch
-	# 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
-	#-----------------------------------------------------------------------
-	# glibc preload issue
-	append-ldflags -Wl,-z,now -L/usr/$(get_libdir)
-	for info_var in myconf CFLAGS LDFLAGS; do
-		einfo "${info_var} is: ${!info_var}"
-	done
-	#-----------------------------------------------------------------------
-	#default_{static,shared}_modules|source/configure
-	cd ${S}/source
-	econf \
-		--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:"
-	emake 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 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
-	# suid compile ---------------------------------------------------------
-	cd ${S}/source
-	gcc ${CFLAGS} ${LDFLAGS} client/mount.cifs.c -o bin/mount.cifs || die "mount.cifs compile problem"
-}
-
-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.gz smb.conf.example.gz
-	doins ${FILESDIR}/lmhosts
-	#doins ${FILESDIR}/recycle.conf #obsolete: see bug #68315
-	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 "2004-05: LIBs location change: /usr/lib/samba/*"
-	ewarn "            (due to ldap/vfs external tools assumptions)"
-	ewarn "2004-09: LIBs default flags changes: LDFLAGS+='-Wl,-z,now'"
-	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 "2004-07: WARNING: smbldap-tools changes"
-		einfo "         smbldap-tools conf changed to /etc/smbldap-tools"
-		einfo "         /usr/share/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-r1.ebuild b/net-fs/samba/samba-3.0.7-r1.ebuild
deleted file mode 100644
index 4f7a8defe9b9..000000000000
--- a/net-fs/samba/samba-3.0.7-r1.ebuild
+++ /dev/null
@@ -1,374 +0,0 @@
-# Copyright 1999-2005 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-r1.ebuild,v 1.12 2005/01/09 11:24:33 swegener Exp $
-
-inherit eutils flag-o-matic
-#---------------------------------------------------------------------------
-IUSE="kerberos mysql postgres xml xml2 acl cups ldap pam readline python doc"
-IUSE="${IUSE} oav selinux"
-#---------------------------------------------------------------------------
-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
-#selinux: bug #62907
-RDEPEND="ldap? ( dev-perl/perl-ldap ) ${_COMMON_DEPS}
-	selinux? ( sec-policy/selinux-samba )"
-#---------------------------------------------------------------------------
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~arm hppa ~ia64 mips ~ppc ~ppc64 ~s390 sparc x86"
-#===========================================================================
-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
-	#amd64 lib location is not lib32 nor lib -------------------------------
-	cd ${S} || die
-	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
-	# Prep samba-vscan source.
-	use oav && cp -a ${WORKDIR}/${PN}-vscan-${VSCAN_VER} ${S}/examples/VFS
-	#-----------------------------------------------------------------------
-	cd ${S}/source
-	echo "Running autoconf ..."
-	autoconf || die
-}
-#===========================================================================
-my_configure() {
-	local myconf="$1"
-	#-----------------------------------------------------------------------
-	for info_var in myconf CFLAGS LDFLAGS; do
-		einfo "${info_var} is: ${!info_var}"
-	done
-	#-----------------------------------------------------------------------
-	#default_{static,shared}_modules|source/configure
-	cd ${S}/source
-	econf \
-		--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:"
-	emake showlayout
-	# serialized headers make ----------------------------------------------
-	make proto
-}
-#===========================================================================
-src_compile() {
-	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"
-	#-----------------------------------------------------------------------
-	# Removing: bug #64815 states that ads in amd64 is now ok
-	###if [ "${ARCH}" != "amd64" ]; then
-	###	use kerberos && use ldap \
-	###		&& myconf="${myconf} --with-ads" \
-	###		|| myconf="${myconf} --without-ads"
-	###else
-	###	myconf="${myconf} --without-ads"
-	###fi
-	use kerberos && use ldap \
-		&& myconf="${myconf} --with-ads" \
-		|| myconf="${myconf} --without-ads"
-	#-----------------------------------------------------------------------
-	append-ldflags -L/usr/$(get_libdir) # lib64 location
-	append-ldflags -Wl,-z,now # lib preload
-	# SUID configure -------------------------------------------------------
-	my_configure "${myconf}"
-	# SUID compile ---------------------------------------------------------
-	for file in smbmnt smbumount; do
-		einfo "LD: BIND_NOW: bin/${file}"
-		rm -f bin/${file}
-		emake bin/${file} || die "LD: BIND_NOW: bin/${file} compile error"
-	done
-	for file in mount.cifs; do
-		einfo "LD: BIND_NOW: bin/${file}"
-		gcc ${CFLAGS} ${LDFLAGS} client/${file}.c -o bin/${file} || die "LD: BIND_NOW: bin/${file} compile error"
-	done
-	# CONFIGURE ------------------------------------------------------------
-	LDFLAGS=${LDFLAGS/-Wl,-z,now/} #lib preload change must affect suid only!
-	my_configure "${myconf}"
-	# 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 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
-}
-#===========================================================================
-src_install() {
-	local i #for cicles
-	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.gz smb.conf.example.gz
-	doins ${FILESDIR}/lmhosts
-	#doins ${FILESDIR}/recycle.conf #obsolete: see bug #68315
-	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 "2004-05: LIBs location change: /usr/lib/samba/*"
-	ewarn "            (due to ldap/vfs external tools assumptions)"
-	ewarn "2004-09: LIBs flags changes for suid bins: LDFLAGS+='-Wl,-z,now'"
-	ewarn "         3.0.7: param: 'winbind enable local accounts' is now"
-	ewarn "                       disabled by default"
-	ewarn ""
-	einfo "If you experience client locks in file transfers _only_, try the parameter"
-	einfo "         use sendfile = no (man smb.conf(5), man sendfile(2))"
-	einfo "There also seem some problems with the smbfs implementation of the recent 2.6.x kernels"
-	einfo "If you experience problems (lockups) with smbfs, try cifs as an alternative"
-	einfo ""
-	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 "2004-07: WARNING: smbldap-tools changes"
-		einfo "         smbldap-tools conf changed to /etc/smbldap-tools"
-		einfo "         /usr/share/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
deleted file mode 100644
index 42d5e60f103b..000000000000
--- a/net-fs/samba/samba-3.0.7.ebuild
+++ /dev/null
@@ -1,366 +0,0 @@
-# Copyright 1999-2005 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.9 2005/01/09 11:24:33 swegener Exp $
-
-inherit eutils flag-o-matic
-
-IUSE="kerberos mysql postgres xml xml2 acl cups ldap pam readline python doc"
-IUSE="${IUSE} oav selinux"
-
-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
-#selinux: bug #62907
-RDEPEND="ldap? ( dev-perl/perl-ldap ) ${_COMMON_DEPS}
-	selinux? ( sec-policy/selinux-samba )"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="arm alpha amd64 hppa ia64 mips ppc ppc64 s390 sparc x86"
-
-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
-	#amd64 lib location is not lib32 nor lib -------------------------------
-	cd ${S} || die
-	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
-	# 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
-	#-----------------------------------------------------------------------
-	# glibc preload issue
-	append-ldflags -Wl,-z,now -L/usr/$(get_libdir)
-	for info_var in myconf CFLAGS LDFLAGS; do
-		einfo "${info_var} is: ${!info_var}"
-	done
-	#-----------------------------------------------------------------------
-	#default_{static,shared}_modules|source/configure
-	cd ${S}/source
-	econf \
-		--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:"
-	emake 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 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
-	# suid compile ---------------------------------------------------------
-	cd ${S}/source
-	gcc ${CFLAGS} ${LDFLAGS} client/mount.cifs.c -o bin/mount.cifs || die "mount.cifs compile problem"
-}
-
-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.gz smb.conf.example.gz
-	doins ${FILESDIR}/lmhosts
-	#doins ${FILESDIR}/recycle.conf #obsolete: see bug #68315
-	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 "2004-05: LIBs location change: /usr/lib/samba/*"
-	ewarn "            (due to ldap/vfs external tools assumptions)"
-	ewarn "2004-09: LIBs default flags changes: LDFLAGS+='-Wl,-z,now'"
-	ewarn "         3.0.7: param: 'winbind enable local accounts' is now"
-	ewarn "                       disabled by default"
-	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 "2004-07: 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.8-r1.ebuild b/net-fs/samba/samba-3.0.8-r1.ebuild
deleted file mode 100644
index f1a401687a48..000000000000
--- a/net-fs/samba/samba-3.0.8-r1.ebuild
+++ /dev/null
@@ -1,415 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-fs/samba/samba-3.0.8-r1.ebuild,v 1.5 2005/01/09 11:24:33 swegener Exp $
-
-inherit eutils flag-o-matic
-#---------------------------------------------------------------------------
-IUSE="acl cups doc kerberos ldap mysql pam postgres python quotas readline winbind xml xml2"
-IUSE="${IUSE} libclamav oav"
-IUSE="${IUSE} selinux"
-#---------------------------------------------------------------------------
-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}-3.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
-#selinux: bug #62907
-RDEPEND="ldap? ( dev-perl/perl-ldap ) ${_COMMON_DEPS}
-	selinux? ( sec-policy/selinux-samba )"
-#---------------------------------------------------------------------------
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
-#===========================================================================
-pkg_setup() {
-	ewarn "2004-11: new ebuild flags:"
-	ewarn "    quotas:    now disabled by default"
-	ewarn "    winbind:   now disabled by default"
-	ewarn "    libclamav: (oav) don't use clamav daemon, just load libraries when needed"
-	ewarn "/etc/samba/private moved to /var/lib/samba/private"
-	ebeep
-	epause
-	local PRIVATEDIR=/var/lib/samba/private
-	local PRIVATE_SRC=/etc/samba/private
-	if [[ ! -r ${PRIVATEDIR}/secrets.tdb && -r ${PRIVATE_SRC}/secrets.tdb ]]; then
-		einfo "Copying ${PRIVATE_SRC}/* to ${PRIVATEDIR}/"
-		cp -af ${PRIVATE_SRC}/* ${D}${PRIVATEDIR}/
-	fi
-}
-#===========================================================================
-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) --------------------------------------------------------
-	epatch ${FILESDIR}/samba-3.0.8-lanman.patch || die # win9x/Me NULL printing
-	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
-	#amd64 lib location is not lib32 nor lib -------------------------------
-	cd ${S} || die
-	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
-	# Prep samba-vscan source.
-	if use oav ; then
-		cd ${WORKDIR}/${PN}-vscan-${VSCAN_VER}
-		epatch ${FILESDIR}/vscan-${VSCAN_VER}-libclamav.patch
-		cp -a ${WORKDIR}/${PN}-vscan-${VSCAN_VER} ${S}/examples/VFS
-	fi
-	#-----------------------------------------------------------------------
-	cd ${S}/source
-	echo "Running autoconf ..."
-	autoconf || die
-}
-#===========================================================================
-my_configure() {
-	local myconf="$1"
-	#-----------------------------------------------------------------------
-	for info_var in myconf CFLAGS LDFLAGS; do
-		einfo "${info_var} is: ${!info_var}"
-	done
-	#-----------------------------------------------------------------------
-	#default_{static,shared}_modules|source/configure
-	cd ${S}/source
-	econf \
-		--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=/var/lib/samba/private \
-		\
-		--enable-static \
-		--enable-shared \
-		--with-manpages-langs=en \
-		--without-spinlocks \
-		--with-libsmbclient \
-		--with-automount \
-		--with-smbmount \
-		--with-syslog \
-		--with-idmap \
-		--host=${CHOST} \
-		${myconf} || die
-	# Show install dirs ----------------------------------------------------
-	einfo "Dir conf:"
-	emake showlayout
-	# serialized headers make ----------------------------------------------
-	make proto
-}
-#===========================================================================
-src_compile() {
-	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 quotas \
-		&& myconf="${myconf} --with-quotas --with-sys-quotas" \
-		|| myconf="${myconf} --without-quotas --without-sys-quotas"
-	use winbind \
-		&& myconf="${myconf} --with-winbind" \
-		|| myconf="${myconf} --without-winbind"
-	use python \
-		&& myconf="${myconf} --with-python=yes" \
-		|| myconf="${myconf} --with-python=no"
-	use readline \
-		&& myconf="${myconf} --with-readline" \
-		|| myconf="${myconf} --without-readline"
-	#-----------------------------------------------------------------------
-	# Removing: bug #64815 states that ads in amd64 is now ok
-	###if [ "${ARCH}" != "amd64" ]; then
-	###	use kerberos && use ldap \
-	###		&& myconf="${myconf} --with-ads" \
-	###		|| myconf="${myconf} --without-ads"
-	###else
-	###	myconf="${myconf} --without-ads"
-	###fi
-	use kerberos && use ldap \
-		&& myconf="${myconf} --with-ads" \
-		|| myconf="${myconf} --without-ads"
-	#-----------------------------------------------------------------------
-	append-ldflags -L/usr/$(get_libdir) # lib64 location
-	append-ldflags -Wl,-z,now # lib preload
-	# SUID configure -------------------------------------------------------
-	my_configure "${myconf}"
-	# SUID compile ---------------------------------------------------------
-	for file in smbmnt smbumount; do
-		einfo "LD: BIND_NOW: bin/${file}"
-		rm -f bin/${file}
-		emake bin/${file} || die "LD: BIND_NOW: bin/${file} compile error"
-	done
-	for file in mount.cifs; do
-		einfo "LD: BIND_NOW: bin/${file}"
-		gcc ${CFLAGS} ${LDFLAGS} client/${file}.c -o bin/${file} || die "LD: BIND_NOW: bin/${file} compile error"
-	done
-	# CONFIGURE ------------------------------------------------------------
-	LDFLAGS=${LDFLAGS/-Wl,-z,now/} #lib preload change must affect suid only!
-	my_configure "${myconf}"
-	# 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 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}
-		my_conf="--prefix=/usr --libdir=/usr/lib/samba"
-		use libclamav && my_conf="${my_conf} --with-libclamav"
-		./configure ${my_conf}
-		assert "bad ${PN}-vscan-${VSCAN_VER} ./configure"
-		emake # ${VSCAN_MODS}
-	fi
-}
-#===========================================================================
-src_install() {
-	local i #for cicles
-	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
-	doexe ${S}/source/nsswitch/libnss_wins.so
-	( cd ${D}/lib; ln -s libnss_wins.so libnss_wins.so.2 )
-	if use winbind; then
-		doexe ${S}/source/nsswitch/libnss_winbind.so
-		( cd ${D}/lib; ln -s libnss_winbind.so libnss_winbind.so.2 )
-		exeinto /lib/security && doexe ${S}/source/nsswitch/pam_winbind.so
-	fi
-	exeinto /lib/security
-	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.gz smb.conf.example.gz
-	doins ${FILESDIR}/lmhosts
-	#doins ${FILESDIR}/recycle.conf #obsolete: see bug #68315
-	insinto /etc/pam.d
-	newins ${FILESDIR}/samba.pam samba
-	use winbind && 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
-	local PRIVATE_DST=/var/lib/samba/private
-	dodir ${PRIVATE_DST}
-	touch ${D}${PRIVATE_DST}/.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
-	use winbind && dodoc ${FILESDIR}/nsswitch.conf-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
-	# in case of upstream packaging errors... (bug #70628)
-	chown -R root:root ${D}/usr/share/doc/${PF}
-	chmod go+r  `find ${D}/usr/share/doc/${PF} -type f`
-	chmod go+rx `find ${D}/usr/share/doc/${PF} -type d`
-	# 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
-
-	local PRIVATE_DST=/var/lib/samba/private
-	local PRIVATE_SRC=/etc/samba/private
-	if [[ ! -r ${PRIVATE_DST}/secrets.tdb && -r ${PRIVATE_SRC}/secrets.tdb ]]; then
-		einfo "Copying ${PRIVATE_SRC}/* to ${PRIVATE_DST}/"
-		cp -af ${PRIVATE_SRC}/* ${D}${PRIVATE_DST}/
-	fi
-
-	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 "2004-05: LIBs location change: /usr/lib/samba/*"
-	ewarn "            (due to ldap/vfs external tools assumptions)"
-	ewarn "2004-09: LIBs flags changes for suid bins: LDFLAGS+='-Wl,-z,now'"
-	if use winbind; then
-		ewarn "         3.0.7: param: 'winbind enable local accounts' is now"
-		ewarn "                       disabled by default"
-	fi
-	ewarn "2004-11: /etc/samba/private moved to /var/lib/samba/private "
-	ewarn "            for better File System Hierarchy adeherence"
-	ewarn ""
-	einfo "If you experience client locks in file transfers _only_, try the parameter"
-	einfo "         use sendfile = no (man smb.conf(5), man sendfile(2))"
-	einfo "There also seem some problems with the smbfs implementation of the recent 2.6.x kernels"
-	einfo "If you experience problems (lockups) with smbfs, try cifs as an alternative"
-	einfo ""
-	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 "2004-07: WARNING: smbldap-tools changes"
-		einfo "    smbldap-tools conf changed to /etc/smbldap-tools"
-		einfo "    /usr/share/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.8.ebuild b/net-fs/samba/samba-3.0.8.ebuild
deleted file mode 100644
index f9cfdf131cd7..000000000000
--- a/net-fs/samba/samba-3.0.8.ebuild
+++ /dev/null
@@ -1,408 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-fs/samba/samba-3.0.8.ebuild,v 1.12 2005/01/09 11:24:33 swegener Exp $
-
-inherit eutils flag-o-matic
-#---------------------------------------------------------------------------
-IUSE="acl cups doc kerberos ldap mysql pam postgres python quotas readline winbind xml xml2"
-IUSE="${IUSE} libclamav oav"
-IUSE="${IUSE} selinux"
-#---------------------------------------------------------------------------
-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
-#selinux: bug #62907
-RDEPEND="ldap? ( dev-perl/perl-ldap ) ${_COMMON_DEPS}
-	selinux? ( sec-policy/selinux-samba )"
-#---------------------------------------------------------------------------
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 mips ppc ppc64 s390 sparc x86"
-#===========================================================================
-pkg_setup() {
-	ewarn "2004-11: new ebuild flags:"
-	ewarn "    quotas:    now disabled by default"
-	ewarn "    winbind:   now disabled by default"
-	ewarn "    libclamav: (oav) don't use clamav daemon, just load libraries when needed"
-	ewarn "/etc/samba/private moved to /var/lib/samba/private"
-	ebeep
-	epause
-}
-#===========================================================================
-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
-	#amd64 lib location is not lib32 nor lib -------------------------------
-	cd ${S} || die
-	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
-	# Prep samba-vscan source.
-	if use oav ; then
-		cd ${WORKDIR}/${PN}-vscan-${VSCAN_VER}
-		epatch ${FILESDIR}/vscan-${VSCAN_VER}-libclamav.patch
-		cp -a ${WORKDIR}/${PN}-vscan-${VSCAN_VER} ${S}/examples/VFS
-	fi
-	#-----------------------------------------------------------------------
-	cd ${S}/source
-	echo "Running autoconf ..."
-	autoconf || die
-}
-#===========================================================================
-my_configure() {
-	local myconf="$1"
-	#-----------------------------------------------------------------------
-	for info_var in myconf CFLAGS LDFLAGS; do
-		einfo "${info_var} is: ${!info_var}"
-	done
-	#-----------------------------------------------------------------------
-	#default_{static,shared}_modules|source/configure
-	cd ${S}/source
-	econf \
-		--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=/var/lib/samba/private \
-		\
-		--enable-static \
-		--enable-shared \
-		--with-manpages-langs=en \
-		--without-spinlocks \
-		--with-libsmbclient \
-		--with-automount \
-		--with-smbmount \
-		--with-syslog \
-		--with-idmap \
-		--host=${CHOST} \
-		${myconf} || die
-	# Show install dirs ----------------------------------------------------
-	einfo "Dir conf:"
-	emake showlayout
-	# serialized headers make ----------------------------------------------
-	make proto
-}
-#===========================================================================
-src_compile() {
-	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 quotas \
-		&& myconf="${myconf} --with-quotas --with-sys-quotas" \
-		|| myconf="${myconf} --without-quotas --without-sys-quotas"
-	use winbind \
-		&& myconf="${myconf} --with-winbind" \
-		|| myconf="${myconf} --without-winbind"
-	use python \
-		&& myconf="${myconf} --with-python=yes" \
-		|| myconf="${myconf} --with-python=no"
-	use readline \
-		&& myconf="${myconf} --with-readline" \
-		|| myconf="${myconf} --without-readline"
-	#-----------------------------------------------------------------------
-	# Removing: bug #64815 states that ads in amd64 is now ok
-	###if [ "${ARCH}" != "amd64" ]; then
-	###	use kerberos && use ldap \
-	###		&& myconf="${myconf} --with-ads" \
-	###		|| myconf="${myconf} --without-ads"
-	###else
-	###	myconf="${myconf} --without-ads"
-	###fi
-	use kerberos && use ldap \
-		&& myconf="${myconf} --with-ads" \
-		|| myconf="${myconf} --without-ads"
-	#-----------------------------------------------------------------------
-	append-ldflags -L/usr/$(get_libdir) # lib64 location
-	append-ldflags -Wl,-z,now # lib preload
-	# SUID configure -------------------------------------------------------
-	my_configure "${myconf}"
-	# SUID compile ---------------------------------------------------------
-	for file in smbmnt smbumount; do
-		einfo "LD: BIND_NOW: bin/${file}"
-		rm -f bin/${file}
-		emake bin/${file} || die "LD: BIND_NOW: bin/${file} compile error"
-	done
-	for file in mount.cifs; do
-		einfo "LD: BIND_NOW: bin/${file}"
-		gcc ${CFLAGS} ${LDFLAGS} client/${file}.c -o bin/${file} || die "LD: BIND_NOW: bin/${file} compile error"
-	done
-	# CONFIGURE ------------------------------------------------------------
-	LDFLAGS=${LDFLAGS/-Wl,-z,now/} #lib preload change must affect suid only!
-	my_configure "${myconf}"
-	# 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 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}
-		my_conf="--prefix=/usr --libdir=/usr/lib/samba"
-		use libclamav && my_conf="${my_conf} --with-libclamav"
-		./configure ${my_conf}
-		assert "bad ${PN}-vscan-${VSCAN_VER} ./configure"
-		emake # ${VSCAN_MODS}
-	fi
-}
-#===========================================================================
-src_install() {
-	local i #for cicles
-	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
-	doexe ${S}/source/nsswitch/libnss_wins.so
-	( cd ${D}/lib; ln -s libnss_wins.so libnss_wins.so.2 )
-	if use winbind; then
-		doexe ${S}/source/nsswitch/libnss_winbind.so
-		( cd ${D}/lib; ln -s libnss_winbind.so libnss_winbind.so.2 )
-		exeinto /lib/security && doexe ${S}/source/nsswitch/pam_winbind.so
-	fi
-	exeinto /lib/security
-	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.gz smb.conf.example.gz
-	doins ${FILESDIR}/lmhosts
-	#doins ${FILESDIR}/recycle.conf #obsolete: see bug #68315
-	insinto /etc/pam.d
-	newins ${FILESDIR}/samba.pam samba
-	use winbind && 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 /var/lib/samba/private
-	touch ${D}/var/lib/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
-	use winbind && dodoc ${FILESDIR}/nsswitch.conf-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
-	local PRIVATE_DST=/var/lib/samba/private
-	local PRIVATE_SRC=/etc/samba/private
-	if [[ ! -r ${PRIVATE_DST}/secrets.tdb && -r ${PRIVATE_SRC}/secrets.tdb ]]; then
-		einfo "Copying ${PRIVATE_SRC}/* to ${PRIVATE_DST}/"
-		cp -af ${PRIVATE_SRC}/* ${D}${PRIVATE_DST}/
-	fi
-
-	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 "2004-05: LIBs location change: /usr/lib/samba/*"
-	ewarn "            (due to ldap/vfs external tools assumptions)"
-	ewarn "2004-09: LIBs flags changes for suid bins: LDFLAGS+='-Wl,-z,now'"
-	if use winbind; then
-		ewarn "         3.0.7: param: 'winbind enable local accounts' is now"
-		ewarn "                       disabled by default"
-	fi
-	ewarn "2004-11: /etc/samba/private moved to /var/lib/samba/private "
-	ewarn "            for better File System Hierarchy adeherence"
-	ewarn ""
-	einfo "If you experience client locks in file transfers _only_, try the parameter"
-	einfo "         use sendfile = no (man smb.conf(5), man sendfile(2))"
-	einfo "There also seem some problems with the smbfs implementation of the recent 2.6.x kernels"
-	einfo "If you experience problems (lockups) with smbfs, try cifs as an alternative"
-	einfo ""
-	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 "2004-07: WARNING: smbldap-tools changes"
-		einfo "    smbldap-tools conf changed to /etc/smbldap-tools"
-		einfo "    /usr/share/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.9-r1.ebuild b/net-fs/samba/samba-3.0.9-r1.ebuild
deleted file mode 100644
index 56924d3f9646..000000000000
--- a/net-fs/samba/samba-3.0.9-r1.ebuild
+++ /dev/null
@@ -1,400 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-fs/samba/samba-3.0.9-r1.ebuild,v 1.5 2005/01/09 11:24:33 swegener Exp $
-
-inherit eutils flag-o-matic
-#---------------------------------------------------------------------------
-IUSE="acl cups doc kerberos ldap mysql pam postgres python quotas readline winbind xml xml2"
-IUSE="${IUSE} libclamav oav"
-IUSE="${IUSE} selinux"
-#---------------------------------------------------------------------------
-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
-	http://www.gentoo.org/~satya/packages/samba/samba-3.0.9-CAN-2004-1154.patch.bz2
-	oav? ( mirror://sourceforge/openantivirus/${PN}-vscan-${VSCAN_VER}.tar.bz2 )
-	ldap? ( http://samba.idealx.org/dist/smbldap-tools-${SMBLDAP_TOOLS_VER}-3.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
-#selinux: bug #62907
-RDEPEND="ldap? ( dev-perl/perl-ldap ) ${_COMMON_DEPS}
-	selinux? ( sec-policy/selinux-samba )"
-#---------------------------------------------------------------------------
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 ~arm hppa ~ia64 mips ppc ppc64 ~s390 sparc x86"
-#===========================================================================
-pkg_setup() {
-	ewarn "2004-11: new ebuild flags:"
-	ewarn "    quotas:    now disabled by default"
-	ewarn "    winbind:   now disabled by default"
-	ewarn "    libclamav: (oav) don't use clamav daemon, just load libraries when needed"
-	ewarn "/etc/samba/private moved to /var/lib/samba/private"
-	ebeep
-	epause
-	local PRIVATEDIR=/var/lib/samba/private
-	local PRIVATE_SRC=/etc/samba/private
-	if [[ ! -r ${PRIVATEDIR}/secrets.tdb && -r ${PRIVATE_SRC}/secrets.tdb ]]; then
-		einfo "Copying ${PRIVATE_SRC}/* to ${PRIVATEDIR}/"
-		cp -af ${PRIVATE_SRC}/* ${D}${PRIVATEDIR}/
-	fi
-}
-#===========================================================================
-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) --------------------------------------------------------
-	epatch ${FILESDIR}/samba-3.0.x-python-setup.patch || die
-	epatch ${DISTDIR}/samba-3.0.9-CAN-2004-1154.patch.bz2 || die
-	epatch ${FILESDIR}/samba-3.0.9-*.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
-	#amd64 lib location is not lib32 nor lib -------------------------------
-	cd ${S} || die
-	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
-	# Prep samba-vscan source.
-	if use oav ; then
-		cd ${WORKDIR}/${PN}-vscan-${VSCAN_VER}
-		epatch ${FILESDIR}/vscan-${VSCAN_VER}-libclamav.patch
-		cp -a ${WORKDIR}/${PN}-vscan-${VSCAN_VER} ${S}/examples/VFS
-	fi
-	#-----------------------------------------------------------------------
-	cd ${S}/source
-	echo "Running autoconf ..."
-	autoconf || die
-}
-#===========================================================================
-my_configure() {
-	local myconf="$1"
-	#-----------------------------------------------------------------------
-	for info_var in myconf CFLAGS LDFLAGS; do
-		einfo "${info_var} is: ${!info_var}"
-	done
-	#-----------------------------------------------------------------------
-	#default_{static,shared}_modules|source/configure
-	cd ${S}/source
-	econf \
-		--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=/var/lib/samba/private \
-		\
-		--enable-static \
-		--enable-shared \
-		--with-manpages-langs=en \
-		--without-spinlocks \
-		--with-libsmbclient \
-		--with-automount \
-		--with-smbmount \
-		--with-syslog \
-		--with-idmap \
-		--host=${CHOST} \
-		${myconf} || die
-	# Show install dirs ----------------------------------------------------
-	einfo "Dir conf:"
-	emake showlayout
-	# serialized headers make ----------------------------------------------
-	make proto
-}
-#===========================================================================
-src_compile() {
-	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 quotas \
-		&& myconf="${myconf} --with-quotas --with-sys-quotas" \
-		|| myconf="${myconf} --without-quotas --without-sys-quotas"
-	use winbind \
-		&& myconf="${myconf} --with-winbind" \
-		|| myconf="${myconf} --without-winbind"
-	use python \
-		&& myconf="${myconf} --with-python=yes" \
-		|| myconf="${myconf} --with-python=no"
-	use readline \
-		&& myconf="${myconf} --with-readline" \
-		|| myconf="${myconf} --without-readline"
-	#-----------------------------------------------------------------------
-	# Removing: bug #64815 states that ads in amd64 is now ok
-	###if [ "${ARCH}" != "amd64" ]; then
-	###	use kerberos && use ldap \
-	###		&& myconf="${myconf} --with-ads" \
-	###		|| myconf="${myconf} --without-ads"
-	###else
-	###	myconf="${myconf} --without-ads"
-	###fi
-	use kerberos && use ldap \
-		&& myconf="${myconf} --with-ads" \
-		|| myconf="${myconf} --without-ads"
-	#-----------------------------------------------------------------------
-	append-ldflags -L/usr/$(get_libdir) # lib64 location
-	# CONFIGURE ------------------------------------------------------------
-	my_configure "${myconf}"
-	# 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 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}
-		my_conf="--prefix=/usr --libdir=/usr/lib/samba"
-		use libclamav && my_conf="${my_conf} --with-libclamav"
-		./configure ${my_conf}
-		assert "bad ${PN}-vscan-${VSCAN_VER} ./configure"
-		emake # ${VSCAN_MODS}
-	fi
-	# SUID configure -------------------------------------------------------
-	append-ldflags -Wl,-z,now # lib preload
-	my_configure "${myconf}"
-	# SUID compile ---------------------------------------------------------
-	for file in smbmnt smbumount; do
-		einfo "LD: BIND_NOW: bin/${file}"
-		rm -f bin/${file}
-		emake bin/${file} || die "LD: BIND_NOW: bin/${file} compile error"
-	done
-	for file in mount.cifs; do
-		einfo "LD: BIND_NOW: bin/${file}"
-		gcc ${CFLAGS} ${LDFLAGS} client/${file}.c -o bin/${file} || die "LD: BIND_NOW: bin/${file} compile error"
-	done
-	LDFLAGS=${LDFLAGS/-Wl,-z,now/} #lib preload change must affect suid only!
-}
-#===========================================================================
-src_install() {
-	local i #for cicles
-	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
-	doexe ${S}/source/nsswitch/libnss_wins.so
-	( cd ${D}/lib; ln -s libnss_wins.so libnss_wins.so.2 )
-	if use winbind; then
-		doexe ${S}/source/nsswitch/libnss_winbind.so
-		( cd ${D}/lib; ln -s libnss_winbind.so libnss_winbind.so.2 )
-		exeinto /lib/security && doexe ${S}/source/nsswitch/pam_winbind.so
-	fi
-	exeinto /lib/security
-	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.gz smb.conf.example.gz
-	doins ${FILESDIR}/lmhosts
-	#doins ${FILESDIR}/recycle.conf #obsolete: see bug #68315
-	insinto /etc/pam.d
-	newins ${FILESDIR}/samba.pam samba
-	use winbind && 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
-	local PRIVATE_DST=/var/lib/samba/private
-	dodir ${PRIVATE_DST}
-	touch ${D}${PRIVATE_DST}/.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
-	use winbind && dodoc ${FILESDIR}/nsswitch.conf-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
-	# 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 "2004-09: LIBs flags changes for suid bins: LDFLAGS+='-Wl,-z,now'"
-	if use winbind; then
-		ewarn "         3.0.7: param: 'winbind enable local accounts' is now"
-		ewarn "                       disabled by default"
-	fi
-	ewarn "2004-11: /etc/samba/private moved to /var/lib/samba/private "
-	ewarn "            for better File System Hierarchy adeherence"
-	ewarn ""
-	einfo "If you experience client locks in file transfers _only_, try the parameter"
-	einfo "         use sendfile = no (man smb.conf(5), man sendfile(2))"
-	einfo "There also seem some problems with the smbfs implementation of the recent 2.6.x kernels"
-	einfo "If you experience problems (lockups) with smbfs, try cifs as an alternative"
-	einfo ""
-	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 ""
-	fi
-}
-
diff --git a/net-fs/samba/samba-3.0.9.ebuild b/net-fs/samba/samba-3.0.9.ebuild
deleted file mode 100644
index 0cc8f98fc55c..000000000000
--- a/net-fs/samba/samba-3.0.9.ebuild
+++ /dev/null
@@ -1,397 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-fs/samba/samba-3.0.9.ebuild,v 1.5 2005/01/09 11:24:33 swegener Exp $
-
-inherit eutils flag-o-matic
-#---------------------------------------------------------------------------
-IUSE="acl cups doc kerberos ldap mysql pam postgres python quotas readline winbind xml xml2"
-IUSE="${IUSE} libclamav oav"
-IUSE="${IUSE} selinux"
-#---------------------------------------------------------------------------
-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}-3.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
-#selinux: bug #62907
-RDEPEND="ldap? ( dev-perl/perl-ldap ) ${_COMMON_DEPS}
-	selinux? ( sec-policy/selinux-samba )"
-#---------------------------------------------------------------------------
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
-#===========================================================================
-pkg_setup() {
-	ewarn "2004-11: new ebuild flags:"
-	ewarn "    quotas:    now disabled by default"
-	ewarn "    winbind:   now disabled by default"
-	ewarn "    libclamav: (oav) don't use clamav daemon, just load libraries when needed"
-	ewarn "/etc/samba/private moved to /var/lib/samba/private"
-	ebeep
-	epause
-	local PRIVATEDIR=/var/lib/samba/private
-	local PRIVATE_SRC=/etc/samba/private
-	if [[ ! -r ${PRIVATEDIR}/secrets.tdb && -r ${PRIVATE_SRC}/secrets.tdb ]]; then
-		einfo "Copying ${PRIVATE_SRC}/* to ${PRIVATEDIR}/"
-		cp -af ${PRIVATE_SRC}/* ${D}${PRIVATEDIR}/
-	fi
-}
-#===========================================================================
-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) --------------------------------------------------------
-	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
-	#amd64 lib location is not lib32 nor lib -------------------------------
-	cd ${S} || die
-	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
-	# Prep samba-vscan source.
-	if use oav ; then
-		cd ${WORKDIR}/${PN}-vscan-${VSCAN_VER}
-		epatch ${FILESDIR}/vscan-${VSCAN_VER}-libclamav.patch
-		cp -a ${WORKDIR}/${PN}-vscan-${VSCAN_VER} ${S}/examples/VFS
-	fi
-	#-----------------------------------------------------------------------
-	cd ${S}/source
-	echo "Running autoconf ..."
-	autoconf || die
-}
-#===========================================================================
-my_configure() {
-	local myconf="$1"
-	#-----------------------------------------------------------------------
-	for info_var in myconf CFLAGS LDFLAGS; do
-		einfo "${info_var} is: ${!info_var}"
-	done
-	#-----------------------------------------------------------------------
-	#default_{static,shared}_modules|source/configure
-	cd ${S}/source
-	econf \
-		--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=/var/lib/samba/private \
-		\
-		--enable-static \
-		--enable-shared \
-		--with-manpages-langs=en \
-		--without-spinlocks \
-		--with-libsmbclient \
-		--with-automount \
-		--with-smbmount \
-		--with-syslog \
-		--with-idmap \
-		--host=${CHOST} \
-		${myconf} || die
-	# Show install dirs ----------------------------------------------------
-	einfo "Dir conf:"
-	emake showlayout
-	# serialized headers make ----------------------------------------------
-	make proto
-}
-#===========================================================================
-src_compile() {
-	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 quotas \
-		&& myconf="${myconf} --with-quotas --with-sys-quotas" \
-		|| myconf="${myconf} --without-quotas --without-sys-quotas"
-	use winbind \
-		&& myconf="${myconf} --with-winbind" \
-		|| myconf="${myconf} --without-winbind"
-	use python \
-		&& myconf="${myconf} --with-python=yes" \
-		|| myconf="${myconf} --with-python=no"
-	use readline \
-		&& myconf="${myconf} --with-readline" \
-		|| myconf="${myconf} --without-readline"
-	#-----------------------------------------------------------------------
-	# Removing: bug #64815 states that ads in amd64 is now ok
-	###if [ "${ARCH}" != "amd64" ]; then
-	###	use kerberos && use ldap \
-	###		&& myconf="${myconf} --with-ads" \
-	###		|| myconf="${myconf} --without-ads"
-	###else
-	###	myconf="${myconf} --without-ads"
-	###fi
-	use kerberos && use ldap \
-		&& myconf="${myconf} --with-ads" \
-		|| myconf="${myconf} --without-ads"
-	#-----------------------------------------------------------------------
-	append-ldflags -L/usr/$(get_libdir) # lib64 location
-	append-ldflags -Wl,-z,now # lib preload
-	# SUID configure -------------------------------------------------------
-	my_configure "${myconf}"
-	# SUID compile ---------------------------------------------------------
-	for file in smbmnt smbumount; do
-		einfo "LD: BIND_NOW: bin/${file}"
-		rm -f bin/${file}
-		emake bin/${file} || die "LD: BIND_NOW: bin/${file} compile error"
-	done
-	for file in mount.cifs; do
-		einfo "LD: BIND_NOW: bin/${file}"
-		gcc ${CFLAGS} ${LDFLAGS} client/${file}.c -o bin/${file} || die "LD: BIND_NOW: bin/${file} compile error"
-	done
-	# CONFIGURE ------------------------------------------------------------
-	LDFLAGS=${LDFLAGS/-Wl,-z,now/} #lib preload change must affect suid only!
-	my_configure "${myconf}"
-	# 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 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}
-		my_conf="--prefix=/usr --libdir=/usr/lib/samba"
-		use libclamav && my_conf="${my_conf} --with-libclamav"
-		./configure ${my_conf}
-		assert "bad ${PN}-vscan-${VSCAN_VER} ./configure"
-		emake # ${VSCAN_MODS}
-	fi
-}
-#===========================================================================
-src_install() {
-	local i #for cicles
-	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
-	doexe ${S}/source/nsswitch/libnss_wins.so
-	( cd ${D}/lib; ln -s libnss_wins.so libnss_wins.so.2 )
-	if use winbind; then
-		doexe ${S}/source/nsswitch/libnss_winbind.so
-		( cd ${D}/lib; ln -s libnss_winbind.so libnss_winbind.so.2 )
-		exeinto /lib/security && doexe ${S}/source/nsswitch/pam_winbind.so
-	fi
-	exeinto /lib/security
-	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.gz smb.conf.example.gz
-	doins ${FILESDIR}/lmhosts
-	#doins ${FILESDIR}/recycle.conf #obsolete: see bug #68315
-	insinto /etc/pam.d
-	newins ${FILESDIR}/samba.pam samba
-	use winbind && 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
-	local PRIVATE_DST=/var/lib/samba/private
-	dodir ${PRIVATE_DST}
-	touch ${D}${PRIVATE_DST}/.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
-	use winbind && dodoc ${FILESDIR}/nsswitch.conf-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
-	# 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 "2004-09: LIBs flags changes for suid bins: LDFLAGS+='-Wl,-z,now'"
-	if use winbind; then
-		ewarn "         3.0.7: param: 'winbind enable local accounts' is now"
-		ewarn "                       disabled by default"
-	fi
-	ewarn "2004-11: /etc/samba/private moved to /var/lib/samba/private "
-	ewarn "            for better File System Hierarchy adeherence"
-	ewarn ""
-	einfo "If you experience client locks in file transfers _only_, try the parameter"
-	einfo "         use sendfile = no (man smb.conf(5), man sendfile(2))"
-	einfo "There also seem some problems with the smbfs implementation of the recent 2.6.x kernels"
-	einfo "If you experience problems (lockups) with smbfs, try cifs as an alternative"
-	einfo ""
-	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 ""
-	fi
-}
-