net-fs/samba old versions cleanup

Package-Manager: portage-2.1_pre7-r5

10 files changed, 9 insertions, 1261 deletions

diff --git a/net-fs/samba/ChangeLog b/net-fs/samba/ChangeLog
index 8e23ea27cddd..5d6e0d781c2b 100644
--- a/net-fs/samba/ChangeLog
+++ b/net-fs/samba/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-fs/samba
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-fs/samba/ChangeLog,v 1.234 2006/04/27 12:36:49 satya Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-fs/samba/ChangeLog,v 1.235 2006/04/27 13:24:48 satya Exp $
+
+  27 Apr 2006; Christian Andreetta <satya@gentoo.org>
+  -samba-3.0.20-r1.ebuild, -samba-3.0.20a.ebuild, -samba-3.0.21b.ebuild,
+  -samba-3.0.21c.ebuild:
+  old versions cleanup
 
 *samba-3.0.22-r1 (27 Apr 2006)
 
diff --git a/net-fs/samba/Manifest b/net-fs/samba/Manifest
index 2a38d7db1200..5dd1bd90d04c 100644
--- a/net-fs/samba/Manifest
+++ b/net-fs/samba/Manifest
@@ -1,6 +1,6 @@
-MD5 ba354db5c71a028893aa42ce30041e28 ChangeLog 40606
-RMD160 d430dd0da979c3705c7ff0c96722a2595c7a99ef ChangeLog 40606
-SHA256 02e6add5f72159e8e1af2b6e55381b465a163c8a276da333af38370c37a2eaf2 ChangeLog 40606
+MD5 36be4c2e307e8e0e7989c4f7ed1bb1f6 ChangeLog 40782
+RMD160 c51d82a5b5e0bbf1f6b2c7dd3b96dfd78541da9d ChangeLog 40782
+SHA256 dcb5dd79ce6bc8c0be1632148b3005ee9950b093b95e5f3944f6238343976960 ChangeLog 40782
 MD5 7cbe28bc9f7e821c88c4f80c39752eb5 files/035_all_samba-3.0.21-winbind_log.patch 438
 RMD160 11b402af2f251c91de0ca1fd2ef0d011f28f1450 files/035_all_samba-3.0.21-winbind_log.patch 438
 SHA256 cf22a104c251470be1347079951d2eef847e1e3e8a9604e491985b9aadd8e0d0 files/035_all_samba-3.0.21-winbind_log.patch 438
@@ -13,27 +13,15 @@ SHA256 dea790af76ff0bbc8379af6139464f3574f2df94b9916d1f026e68b3390d7237 files/di
 MD5 15a9e77f4ef8bd8a597b0efe99599337 files/digest-samba-3.0.14a-r3 209
 RMD160 28c6a39480f107dda8c63108a501ff8654d1c059 files/digest-samba-3.0.14a-r3 209
 SHA256 14a107eb6204746d72464c56162b024bd95a2b8e3778c2d80f30b58a58b20852 files/digest-samba-3.0.14a-r3 209
-MD5 b0edbbe79d56d73a741ab67940725cd5 files/digest-samba-3.0.20-r1 208
-RMD160 a78f0ac5a6c91db04917bf4c7b85836951cc044e files/digest-samba-3.0.20-r1 208
-SHA256 aedbc24da44d46ed100f95759ba72236c37a32b5da1d156064ad9bd15407a735 files/digest-samba-3.0.20-r1 208
-MD5 101abdf5b841b3e0dc27ab5ae299ff79 files/digest-samba-3.0.20a 209
-RMD160 93e82e41963b6353624c515efa12e5af61ad660b files/digest-samba-3.0.20a 209
-SHA256 1214ba01d28a5815fe37373d2be51409915bacb5b0d3ec59d5dcac49a793bfdf files/digest-samba-3.0.20a 209
 MD5 8184e6df43d80b0fde18c5920a5c1e66 files/digest-samba-3.0.20b 210
 RMD160 543bf95703456c4af718d0b991964703b120bd0c files/digest-samba-3.0.20b 210
 SHA256 07c74c34402600edb4ade79ca726daa3e38c1fc33096dbd441aa00aca4daffcc files/digest-samba-3.0.20b 210
 MD5 ad50e9df5afa7a68ae92fafc5d3daf16 files/digest-samba-3.0.21a 771
 RMD160 a32a0d0ac8be9be925086fb62047d31557758121 files/digest-samba-3.0.21a 771
 SHA256 faf73ffb71cafa8a1e1e6ec414653152cbf27f66534cd17d415314c612bcb8f4 files/digest-samba-3.0.21a 771
-MD5 dc35f89eee1482d5d66160435a4ed501 files/digest-samba-3.0.21b 771
-RMD160 e7ca1a5340c12879038990aa3c5ee18c7e086048 files/digest-samba-3.0.21b 771
-SHA256 67e85a0163908cb088d46451c58fad2f34fb3707764f9efe9d52af36372d1b61 files/digest-samba-3.0.21b 771
 MD5 adb7ab134c8c36d103e72cf1b41c3255 files/digest-samba-3.0.21b-r1 771
 RMD160 56ae2c22ea011aec0ab585c3aa452ff7644b01c4 files/digest-samba-3.0.21b-r1 771
 SHA256 2e1f17c1d03f9f6f7fd99942fe59a064ec353f5c464e97f29fc7c534f11fd8af files/digest-samba-3.0.21b-r1 771
-MD5 064044b71a87a5fd0d0a9991b291f1aa files/digest-samba-3.0.21c 771
-RMD160 7f98dee6fd8921ee4cb881db03200444109d77e2 files/digest-samba-3.0.21c 771
-SHA256 6c6e6be13ac92b83a03f76234a239ac5fe2bd3b7bb26e3cf50c8f0de9ab9f6a2 files/digest-samba-3.0.21c 771
 MD5 064044b71a87a5fd0d0a9991b291f1aa files/digest-samba-3.0.21c-r1 771
 RMD160 7f98dee6fd8921ee4cb881db03200444109d77e2 files/digest-samba-3.0.21c-r1 771
 SHA256 6c6e6be13ac92b83a03f76234a239ac5fe2bd3b7bb26e3cf50c8f0de9ab9f6a2 files/digest-samba-3.0.21c-r1 771
@@ -52,12 +40,6 @@ SHA256 5c1b64cee4479cba6f07981995bf562c49ed45d8d8de6fcc76d0ed65227906cd samba-3.
 MD5 b342ed3ffe76e40848625e839ed5820c samba-3.0.14a-r3.ebuild 9280
 RMD160 4bc9f7e1787db5cd13795d932096ed4a706c4f43 samba-3.0.14a-r3.ebuild 9280
 SHA256 cbe9ead876929affb6abb501528cc07a7622fa3eca6d21eb062bb9762867f243 samba-3.0.14a-r3.ebuild 9280
-MD5 bb4b14ed3ad863261a32c5e7501a8b3e samba-3.0.20-r1.ebuild 7959
-RMD160 7536305083e1cd63b4b6ac70731c765d642f6d61 samba-3.0.20-r1.ebuild 7959
-SHA256 80fa7f68e69f30523eef9cfe18f59dc197928013944ab1a8bd050d04e7acc981 samba-3.0.20-r1.ebuild 7959
-MD5 315301fc1dbdf015c2aa049887bd9d59 samba-3.0.20a.ebuild 8177
-RMD160 275f88116fba3c19031721f21a848190233308e8 samba-3.0.20a.ebuild 8177
-SHA256 e412aa2fa18b3b88cec99a2483addfa4ae67d1ad1e088ace2194184c857d3b64 samba-3.0.20a.ebuild 8177
 MD5 56eb4dab3e8e14f80e89d6b85f7dd902 samba-3.0.20b.ebuild 8625
 RMD160 67ac257cf61ffcaf2fab2a3dbcff0a35840bc673 samba-3.0.20b.ebuild 8625
 SHA256 7c816bdf1e9d104d9402add068b96930ce06d869bcce69df8cdcd6725db908f2 samba-3.0.20b.ebuild 8625
@@ -67,15 +49,9 @@ SHA256 8c18e7127bcb06a0d4867a001dbcf71478154d747862cc7a32ef3f9c8ffc2818 samba-3.
 MD5 3f52053c36d38ea2153225d8c6f3f736 samba-3.0.21b-r1.ebuild 8717
 RMD160 d3626b923e3e16cc8581e5d65db6fb52c13036a7 samba-3.0.21b-r1.ebuild 8717
 SHA256 d32bcb2a1a3c0b44c516b642ec80eade95dffc538cf18dfcd36db2a3ed1329dc samba-3.0.21b-r1.ebuild 8717
-MD5 1f09216095d15cd2d95220aca4730b6c samba-3.0.21b.ebuild 8612
-RMD160 ce3345f50584fb3b0d5e3946b7dcafd0b543f425 samba-3.0.21b.ebuild 8612
-SHA256 3f096b5532bfed301c59bd93c601d99ac203a809906b7fad0afd9db3aabc1187 samba-3.0.21b.ebuild 8612
 MD5 3e03c846184396b342ea840fe7a4b5af samba-3.0.21c-r1.ebuild 8718
 RMD160 c64f6e0bc5c8442e6bab0df81f56b95f6424877b samba-3.0.21c-r1.ebuild 8718
 SHA256 468255300550c0e661b043bf2774e1c14d91d2016af3340fb1180d8c1be7c8e7 samba-3.0.21c-r1.ebuild 8718
-MD5 5c77ef195240c56181d7e72fbbc26163 samba-3.0.21c.ebuild 8614
-RMD160 b4447944b1a8b9dc9b8ce0dcd318518e54fd9ead samba-3.0.21c.ebuild 8614
-SHA256 c760d44c512b26c29fecd93bf995cc7e416a23d12c94bbc9e490f3f75c1bb1fc samba-3.0.21c.ebuild 8614
 MD5 1c5f835c90c13a8c771fd6de5eef6aed samba-3.0.22-r1.ebuild 8766
 RMD160 b695ef4d04df051cc31dbf2f21be3ab74ae2989a samba-3.0.22-r1.ebuild 8766
 SHA256 a40342629e7ff6a07c18992ba997c1fe4d32e161a428aa1218bed53af9684c19 samba-3.0.22-r1.ebuild 8766
diff --git a/net-fs/samba/files/digest-samba-3.0.20-r1 b/net-fs/samba/files/digest-samba-3.0.20-r1
deleted file mode 100644
index cdc92648145f..000000000000
--- a/net-fs/samba/files/digest-samba-3.0.20-r1
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 68e72ab16334c329901816febc43217a samba-3.0.20.tar.gz 17182336
-MD5 68c9d099d942d85e68d96804b26ac788 samba-vscan-0.3.6.tar.bz2 166733
-MD5 aef8e3a66f734f16e370b718efa397d8 samba-3-gentoo-0.3.7.tar.bz2 16342
diff --git a/net-fs/samba/files/digest-samba-3.0.20a b/net-fs/samba/files/digest-samba-3.0.20a
deleted file mode 100644
index e9de86b0f9cc..000000000000
--- a/net-fs/samba/files/digest-samba-3.0.20a
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 cd181497bc98e039805a95b8c65a16bb samba-3.0.20a.tar.gz 17187979
-MD5 68c9d099d942d85e68d96804b26ac788 samba-vscan-0.3.6.tar.bz2 166733
-MD5 4dbbc143a9b24812e94b2099683f19ed samba-3-gentoo-0.3.8.tar.bz2 16526
diff --git a/net-fs/samba/files/digest-samba-3.0.21b b/net-fs/samba/files/digest-samba-3.0.21b
deleted file mode 100644
index c62a1f1927dd..000000000000
--- a/net-fs/samba/files/digest-samba-3.0.21b
+++ /dev/null
@@ -1,9 +0,0 @@
-MD5 e68da25c1ff30482c9401e279ae62797 samba-3-gentoo-0.3.11.tar.bz2 15929
-RMD160 2ad449ab8ceddb2d2f940eaebdab7965925038c5 samba-3-gentoo-0.3.11.tar.bz2 15929
-SHA256 8c6de0f26458995b8d095ddc433caac8b183fbc6e5f9cbc240cb762ae3c1f3da samba-3-gentoo-0.3.11.tar.bz2 15929
-RMD160 883f855523e2a079cd7295df6647b3cb9b56c23a samba-3.0.21b.tar.gz 17539079
-SHA256 a5e6982024105276d347b3b521897d6937c727e273814e743ada8eddf972e7d0 samba-3.0.21b.tar.gz 17539079
-MD5 bb73dffb33f4a39386ef9f3e07ae28ff samba-3.0.21b.tar.gz 17539079
-RMD160 5cd81345b06f44b2febf3f24e62325322b1c6a3b samba-vscan-0.3.6b.tar.bz2 164471
-SHA256 2fa680c85ef036a9ac27d1039807881c7a0f35f64f731b1d3a13b860a9135e7a samba-vscan-0.3.6b.tar.bz2 164471
-MD5 900502ba36b80620229b94e5129bc856 samba-vscan-0.3.6b.tar.bz2 164471
diff --git a/net-fs/samba/files/digest-samba-3.0.21c b/net-fs/samba/files/digest-samba-3.0.21c
deleted file mode 100644
index 2ea5182a54e1..000000000000
--- a/net-fs/samba/files/digest-samba-3.0.21c
+++ /dev/null
@@ -1,9 +0,0 @@
-MD5 e68da25c1ff30482c9401e279ae62797 samba-3-gentoo-0.3.11.tar.bz2 15929
-RMD160 2ad449ab8ceddb2d2f940eaebdab7965925038c5 samba-3-gentoo-0.3.11.tar.bz2 15929
-SHA256 8c6de0f26458995b8d095ddc433caac8b183fbc6e5f9cbc240cb762ae3c1f3da samba-3-gentoo-0.3.11.tar.bz2 15929
-MD5 9deeda292399d2bbad120f98a290f5da samba-3.0.21c.tar.gz 17542009
-RMD160 2ad1451007cbb5165f5ca3ce77d84abbbd0d6b52 samba-3.0.21c.tar.gz 17542009
-SHA256 9181b82fe6c3ea6b7b248cfddef34481ca3c114d70fe0f11fb60175179e86b43 samba-3.0.21c.tar.gz 17542009
-MD5 900502ba36b80620229b94e5129bc856 samba-vscan-0.3.6b.tar.bz2 164471
-RMD160 5cd81345b06f44b2febf3f24e62325322b1c6a3b samba-vscan-0.3.6b.tar.bz2 164471
-SHA256 2fa680c85ef036a9ac27d1039807881c7a0f35f64f731b1d3a13b860a9135e7a samba-vscan-0.3.6b.tar.bz2 164471
diff --git a/net-fs/samba/samba-3.0.20-r1.ebuild b/net-fs/samba/samba-3.0.20-r1.ebuild
deleted file mode 100644
index a4ed77c316de..000000000000
--- a/net-fs/samba/samba-3.0.20-r1.ebuild
+++ /dev/null
@@ -1,295 +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.20-r1.ebuild,v 1.4 2005/11/08 13:16:13 satya Exp $
-
-inherit eutils versionator
-
-IUSE_LINGUAS="ja pl"
-IUSE="acl async automount cups doc examples kerberos ldap mysql pam postgres
-	python quotas readline syslog winbind xml xml2 libclamav oav selinux"
-RESTRICT="test"
-
-VSCAN_VER=0.3.6
-PATCH_VER=0.3.7
-MY_P=${PN}-${PV/_/}
-MY_PP=${PN}-$(get_major_version)-gentoo-${PATCH_VER}
-S2=${WORKDIR}/${MY_P}
-S=${S2}/source
-PFVSCAN=${PN}-vscan-${VSCAN_VER}
-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"
-SRC_URI="
-	mirror://samba/${MY_P}.tar.gz
-	mirror://samba/old-versions/${MY_P}.tar.gz
-	oav? ( mirror://sourceforge/openantivirus/${PFVSCAN}.tar.bz2 )
-	mirror://gentoo/${MY_PP}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
-
-RDEPEND="dev-libs/popt
-	acl?       ( sys-apps/acl )
-	cups?      ( net-print/cups )
-	ldap?      ( kerberos? ( virtual/krb5 ) net-nds/openldap )
-	mysql?     ( dev-db/mysql sys-libs/zlib )
-	pam?       ( virtual/pam )
-	postgres?  ( dev-db/postgresql sys-libs/zlib )
-	python?    ( dev-lang/python )
-	readline?  ( sys-libs/readline )
-	syslog?    ( virtual/logger )
-	xml?       ( dev-libs/libxml2 sys-libs/zlib )
-	xml2?      ( dev-libs/libxml2 sys-libs/zlib )
-	selinux? ( sec-policy/selinux-samba )"
-
-DEPEND="${RDEPEND}
-	sys-devel/autoconf
-	>=sys-apps/sed-4"
-
-PRIVATE_DST=/var/lib/samba/private
-PATCHDIR=${WORKDIR}/gentoo/patches
-CONFDIR=${WORKDIR}/gentoo/configs
-
-pkg_setup() {
-	ewarn "3.0.20: New USE flags: syslog, automount, async (default: disabled)"
-	ebeep
-	epause
-}
-
-src_unpack() {
-	unpack ${A}; cd ${S2}
-
-	rm -rf ${S2}/examples.ORIG
-
-	export EPATCH_SUFFIX="patch"
-	epatch ${PATCHDIR}/general
-	if use oav ; then
-		cd ${WORKDIR}
-		epatch ${PATCHDIR}/vscan
-		cp -pPR ${WORKDIR}/${PFVSCAN} ${S2}/examples/VFS
-	fi
-}
-
-src_compile() {
-	ebegin "Running autoconf"
-		autoconf
-	eend $?
-
-	local myconf
-	local mymods
-	local mylangs
-
-	if use xml || use xml2 ;
-	then
-		mymods="xml,${mymods}"
-	fi
-	use mysql && mymods="mysql,${mymods}"
-	use postgres && mymods="pgsql,${mymods}"
-	[[ -n "${mymods}" ]] && myconf="--with-expsam=${mymods}"
-
-	mylangs="en"
-	use linguas_ja && mylangs="${mylangs},ja"
-	use linguas_pl && mylangs="${mylangs},pl"
-	myconf="${myconf} --with-manpages-langs=${mylangs}"
-
-	use ldap && myconf="${myconf} $(use_with kerberos ads)"
-
-	econf \
-		--with-fhs \
-		--sysconfdir=/etc/samba \
-		--localstatedir=/var \
-		--with-configdir=/etc/samba \
-		--with-libdir=/usr/$(get_libdir)/samba \
-		--with-swatdir=/usr/share/doc/${PF}/swat \
-		--with-piddir=/var/run/samba \
-		--with-lockdir=/var/cache/samba \
-		--with-logfilebase=/var/log/samba \
-		--with-privatedir=${PRIVATE_DST} \
-		--with-libsmbclient \
-		--without-spinlocks \
-		--without-ldapsam \
-		$(use_with acl acl-support) \
-		$(use_with async aio-support) \
-		$(use_with automount) \
-		$(use_enable cups) \
-		$(use_with kerberos krb5) \
-		$(use_with ldap) \
-		$(use_with pam) $(use_with pam pam_smbpass) \
-		$(use_with python) \
-		$(use_with quotas) $(use_with quotas sys-quotas) \
-		$(use_with readline) \
-		$(use_with kernel_linux smbmount) \
-		$(use_with syslog) \
-		$(use_with winbind) \
-		${myconf} || die
-
-	emake proto || die "SAMBA make proto error"
-	emake everything || die "SAMBA make everything error"
-
-	einfo "make rpctorture"
-	emake rpctorture || ewarn "rpctorture didn't build"
-
-	if use python ; then
-		python python/setup.py build
-	fi
-
-	# Build samba-vscan plugins
-	if use oav; then
-		cd ${S2}/examples/VFS/${PFVSCAN}
-		econf \
-			--with-fhs \
-			--libdir=/usr/$(get_libdir)/samba \
-			$(use_with libclamav) || die "${PFVSCAN} ./configure failed"
-		emake || die "Failed to make ${PFVSCAN}"
-	fi
-
-}
-
-src_install() {
-	local extra_bins="rpctorture"
-
-	make DESTDIR=${D} install-everything || die
-
-	# Extra rpctorture progs
-	exeinto /usr/bin
-	for i in ${extra_bins}; do
-		[[ -x ${S}/bin/${i} ]] && doexe ${S}/bin/${i}
-		einfo "Extra binaries: ${i}"
-	done
-
-	# remove .old stuff from /usr/bin:
-	rm -f ${D}/usr/bin/*.old
-
-	# Nsswitch extensions. Make link for wins and winbind resolvers
-	dolib.so ${S}/nsswitch/libnss_wins.so
-	dosym libnss_wins.so /usr/$(get_libdir)/libnss_wins.so.2
-	if use winbind; then
-		dolib.so ${S}/nsswitch/libnss_winbind.so
-		dosym libnss_winbind.so /usr/$(get_libdir)/libnss_winbind.so.2
-	fi
-
-	if use pam; then
-		exeinto /$(get_libdir)/security
-		doexe ${S}/bin/pam_smbpass.so
-	fi
-
-	if use pam && use winbind; then
-		exeinto /$(get_libdir)/security
-		doexe ${S}/nsswitch/pam_winbind.so
-	fi
-
-	if use kernel_linux; then
-		# mount backend
-		dodir /sbin
-		dosym ../usr/bin/smbmount /sbin/mount.smbfs
-		dosym ../usr/bin/mount.cifs /sbin/mount.cifs
-	fi
-
-	# bug #46389: samba doesn't create symlink anymore
-	# beaviour seems to be changed in 3.0.6, see bug #61046
-	dosym samba/libsmbclient.so /usr/$(get_libdir)/libsmbclient.so.0
-	dosym samba/libsmbclient.so /usr/$(get_libdir)/libsmbclient.so
-
-	# make the smb backend symlink for cups printing support..
-	if use cups; then
-		dodir /usr/$(get_libdir)/cups/backend
-		dosym ../../../bin/smbspool /usr/$(get_libdir)/cups/backend/smb
-	fi
-
-	# VFS plugin modules
-	if use oav; then
-		cd ${S2}/examples/VFS/${PFVSCAN}
-		make install DESTDIR=${D} || die "VFS: vscan error"
-		insinto /etc/samba
-		doins ${S2}/examples/VFS/${PFVSCAN}/openantivirus/*conf
-	fi
-
-	# Python extensions
-	if use python; then
-		cd ${S}
-		python python/setup.py install --root=${D} || die
-	fi
-
-	# General config files
-	insinto /etc/samba
-	doins ${CONFDIR}/smbusers
-	newins ${CONFDIR}/smb.conf.example-samba3 smb.conf.example
-	doins ${CONFDIR}/lmhosts
-
-	newpamd ${CONFDIR}/samba.pam samba
-	use winbind && doins ${CONFDIR}/system-auth-winbind
-	insinto /etc/xinetd.d
-	newins ${CONFDIR}/swat.xinetd swat
-	newinitd ${CONFDIR}/samba-init samba
-	newconfd ${CONFDIR}/samba-conf samba
-	if use ldap; then
-		insinto /etc/openldap/schema
-		doins ${S2}/examples/LDAP/samba.schema
-	fi
-
-	# dirs
-	diropts -m0700 ; keepdir ${PRIVATE_DST}
-	diropts -m1777 ; keepdir /var/spool/samba
-
-	diropts -m0755
-	keepdir /var/{log,run,cache}/samba
-	keepdir /var/lib/samba/{netlogon,profiles}
-	keepdir /var/lib/samba/printers/{W32X86,WIN40,W32ALPHA,W32MIPS,W32PPC}
-	keepdir /usr/$(get_libdir)/samba/{rpc,idmap,auth}
-
-	# docs
-	dodoc ${FILESDIR}/README.gentoo
-	dodoc ${S2}/{COPYING,Manifest,README,Roadmap,WHATSNEW.txt}
-	dodoc ${CONFDIR}/nsswitch.conf-wins
-	use winbind && dodoc ${CONFDIR}/nsswitch.conf-winbind
-
-	if use examples; then
-		docinto examples
-		cp -pPR ${S2}/examples/* ${D}/usr/share/doc/${PF}/examples
-		chmod -R 755 `find ${D}/usr/share/doc/${PF}/examples -type d`
-		chmod -R 644 `find ${D}/usr/share/doc/${PF}/examples ! -type d`
-	fi
-
-	if use oav; then
-		docinto ${PFVSCAN}
-		cd ${WORKDIR}/${PFVSCAN}
-		dodoc AUTHORS COPYING ChangeLog FAQ INSTALL NEWS README TODO
-		dodoc */*.conf
-	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
-
-	# Patch ChangeLog
-	docinto gentoo
-	dodoc ${PATCHDIR}/ChangeLog
-}
-
-pkg_preinst() {
-	local PRIVATE_SRC=/etc/samba/private
-	if [[ ! -r ${ROOT}/${PRIVATE_DST}/secrets.tdb \
-		&& -r ${ROOT}/${PRIVATE_SRC}/secrets.tdb ]]; then
-		ebegin "Copying ${ROOT}/${PRIVATE_SRC}/* to ${ROOT}/${PRIVATE_DST}/"
-			mkdir -p ${IMAGE}/${PRIVATE_DST}
-			cp -pPRf ${ROOT}/${PRIVATE_SRC}/* ${IMAGE}/${PRIVATE_DST}/
-		eend $?
-	fi
-
-	if [[ ! -f "${ROOT}/etc/samba/smb.conf" ]]; then
-		touch ${IMAGE}/etc/samba/smb.conf
-	fi
-}
-
-pkg_postinst() {
-	einfo "Latest info: README.gentoo in documentation directory"
-}
-
-pkg_postrm(){
-	# If stale docs, and one isn't re-emerging the latest version, removes
-	# (this is actually a portage bug, though)
-	[[ -n "${PF}" && ! -f ${ROOT}/usr/lib/${PN}/en.msg ]] && \
-		rm -rf ${ROOT}/usr/share/doc/${PF}
-}
-
diff --git a/net-fs/samba/samba-3.0.20a.ebuild b/net-fs/samba/samba-3.0.20a.ebuild
deleted file mode 100644
index ae9914d10fda..000000000000
--- a/net-fs/samba/samba-3.0.20a.ebuild
+++ /dev/null
@@ -1,298 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-fs/samba/samba-3.0.20a.ebuild,v 1.3 2006/01/29 05:19:31 vapier Exp $
-
-inherit eutils versionator
-
-IUSE_LINGUAS="ja pl"
-IUSE="acl async automount cups doc examples kerberos ldap mysql pam postgres
-	python quotas readline syslog winbind xml xml2 libclamav oav selinux"
-RESTRICT="test"
-
-VSCAN_VER=0.3.6
-PATCH_VER=0.3.8
-MY_P=${PN}-${PV/_/}
-MY_PP=${PN}-$(get_major_version)-gentoo-${PATCH_VER}
-S2=${WORKDIR}/${MY_P}
-S=${S2}/source
-PFVSCAN=${PN}-vscan-${VSCAN_VER}
-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"
-SRC_URI="mirror://samba/${MY_P}.tar.gz
-	mirror://samba/old-versions/${MY_P}.tar.gz
-	oav? ( mirror://sourceforge/openantivirus/${PFVSCAN}.tar.bz2 )
-	mirror://gentoo/${MY_PP}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
-
-RDEPEND="dev-libs/popt
-	acl?       ( sys-apps/acl )
-	cups?      ( net-print/cups )
-	ldap?      ( kerberos? ( virtual/krb5 ) net-nds/openldap )
-	mysql?     ( dev-db/mysql sys-libs/zlib )
-	pam?       ( virtual/pam )
-	postgres?  ( dev-db/postgresql sys-libs/zlib )
-	python?    ( dev-lang/python )
-	readline?  ( sys-libs/readline )
-	syslog?    ( virtual/logger )
-	xml?       ( dev-libs/libxml2 sys-libs/zlib )
-	xml2?      ( dev-libs/libxml2 sys-libs/zlib )
-	selinux? ( sec-policy/selinux-samba )"
-
-DEPEND="${RDEPEND}
-	sys-devel/autoconf
-	>=sys-apps/sed-4"
-
-PRIVATE_DST=/var/lib/samba/private
-PATCHDIR=${WORKDIR}/gentoo/patches
-CONFDIR=${WORKDIR}/gentoo/configs
-
-pkg_setup() {
-	ewarn "3.0.20: New USE flags: syslog, automount, async (default: disabled)"
-	ebeep
-	epause
-}
-
-src_unpack() {
-	unpack ${A}; cd ${S2}
-
-	rm -rf ${S2}/examples.ORIG
-
-	export EPATCH_SUFFIX="patch"
-	epatch ${PATCHDIR}/general
-	if use oav ; then
-		cd ${WORKDIR}
-		epatch ${PATCHDIR}/vscan
-		cp -pPR ${WORKDIR}/${PFVSCAN} ${S2}/examples/VFS
-	fi
-
-	# https://bugzilla.samba.org/show_bug.cgi?id=3451
-	sed -i -e '/include.*fstab.h/d' "${S}"/client/umount.cifs.c
-}
-
-src_compile() {
-	ebegin "Running autoconf"
-		autoconf
-	eend $?
-
-	local myconf
-	local mymods
-	local mylangs
-
-	if use xml || use xml2 ; then
-		mymods="xml,${mymods}"
-	fi
-	use mysql && mymods="mysql,${mymods}"
-	use postgres && mymods="pgsql,${mymods}"
-	[[ -n "${mymods}" ]] && myconf="--with-expsam=${mymods}"
-
-	mylangs="en"
-	use linguas_ja && mylangs="${mylangs},ja"
-	use linguas_pl && mylangs="${mylangs},pl"
-	myconf="${myconf} --with-manpages-langs=${mylangs}"
-
-	if use ldap; then
-		myconf="${myconf} $(use_with ldap) $(use_with kerberos ads) --with-ldapsam"
-	else
-		myconf="${myconf} --without-ldapsam"
-	fi
-	use winbind && myconf="${myconf} $(use_with winbind) --with-shared-modules=idmap_rid"
-
-	econf \
-		--with-fhs \
-		--sysconfdir=/etc/samba \
-		--localstatedir=/var \
-		--with-configdir=/etc/samba \
-		--with-libdir=/usr/$(get_libdir)/samba \
-		--with-swatdir=/usr/share/doc/${PF}/swat \
-		--with-piddir=/var/run/samba \
-		--with-lockdir=/var/cache/samba \
-		--with-logfilebase=/var/log/samba \
-		--with-privatedir=${PRIVATE_DST} \
-		--with-libsmbclient \
-		--without-spinlocks \
-		$(use_with acl acl-support) \
-		$(use_with async aio-support) \
-		$(use_with automount) \
-		$(use_enable cups) \
-		$(use_with kerberos krb5) \
-		$(use_with pam) $(use_with pam pam_smbpass) \
-		$(use_with python) \
-		$(use_with quotas) $(use_with quotas sys-quotas) \
-		$(use_with readline) \
-		$(use_with kernel_linux smbmount) \
-		$(use_with syslog) \
-		${myconf} || die
-
-	emake proto || die "SAMBA make proto error"
-	emake everything || die "SAMBA make everything error"
-
-	einfo "make rpctorture"
-	emake rpctorture || ewarn "rpctorture didn't build"
-
-	if use python ; then
-		python python/setup.py build
-	fi
-
-	# Build samba-vscan plugins
-	if use oav; then
-		cd ${S2}/examples/VFS/${PFVSCAN}
-		econf \
-			--with-fhs \
-			--libdir=/usr/$(get_libdir)/samba \
-			$(use_with libclamav) || die "${PFVSCAN} ./configure failed"
-		emake || die "Failed to make ${PFVSCAN}"
-	fi
-
-}
-
-src_install() {
-	local extra_bins="rpctorture"
-
-	make DESTDIR=${D} install-everything || die
-
-	# Extra rpctorture progs
-	exeinto /usr/bin
-	for i in ${extra_bins}; do
-		[[ -x ${S}/bin/${i} ]] && doexe ${S}/bin/${i}
-		einfo "Extra binaries: ${i}"
-	done
-
-	# remove .old stuff from /usr/bin:
-	rm -f ${D}/usr/bin/*.old
-
-	# Nsswitch extensions. Make link for wins and winbind resolvers
-	dolib.so ${S}/nsswitch/libnss_wins.so
-	dosym libnss_wins.so /usr/$(get_libdir)/libnss_wins.so.2
-	if use winbind; then
-		dolib.so ${S}/nsswitch/libnss_winbind.so
-		dosym libnss_winbind.so /usr/$(get_libdir)/libnss_winbind.so.2
-	fi
-
-	if use pam; then
-		exeinto /$(get_libdir)/security
-		doexe ${S}/bin/pam_smbpass.so
-	fi
-
-	if use pam && use winbind; then
-		exeinto /$(get_libdir)/security
-		doexe ${S}/nsswitch/pam_winbind.so
-	fi
-
-	if use kernel_linux; then
-		# mount backend
-		dodir /sbin
-		dosym ../usr/bin/smbmount /sbin/mount.smbfs
-		dosym ../usr/bin/mount.cifs /sbin/mount.cifs
-	fi
-
-	# bug #46389: samba doesn't create symlink anymore
-	# beaviour seems to be changed in 3.0.6, see bug #61046
-	dosym samba/libsmbclient.so /usr/$(get_libdir)/libsmbclient.so.0
-	dosym samba/libsmbclient.so /usr/$(get_libdir)/libsmbclient.so
-
-	# make the smb backend symlink for cups printing support..
-	if use cups; then
-		dodir /usr/$(get_libdir)/cups/backend
-		dosym ../../../bin/smbspool /usr/$(get_libdir)/cups/backend/smb
-	fi
-
-	# VFS plugin modules
-	if use oav; then
-		cd ${S2}/examples/VFS/${PFVSCAN}
-		make install DESTDIR=${D} || die "VFS: vscan error"
-		insinto /etc/samba
-		doins ${S2}/examples/VFS/${PFVSCAN}/openantivirus/*conf
-	fi
-
-	# Python extensions
-	if use python; then
-		cd ${S}
-		python python/setup.py install --root=${D} || die
-	fi
-
-	# General config files
-	insinto /etc/samba
-	doins ${CONFDIR}/smbusers
-	newins ${CONFDIR}/smb.conf.example-samba3 smb.conf.example
-	doins ${CONFDIR}/lmhosts
-
-	newpamd ${CONFDIR}/samba.pam samba
-	use winbind && doins ${CONFDIR}/system-auth-winbind
-	insinto /etc/xinetd.d
-	newins ${CONFDIR}/swat.xinetd swat
-	newinitd ${CONFDIR}/samba-init samba
-	newconfd ${CONFDIR}/samba-conf samba
-	if use ldap; then
-		insinto /etc/openldap/schema
-		doins ${S2}/examples/LDAP/samba.schema
-	fi
-
-	# dirs
-	diropts -m0700 ; keepdir ${PRIVATE_DST}
-	diropts -m1777 ; keepdir /var/spool/samba
-
-	diropts -m0755
-	keepdir /var/{log,run,cache}/samba
-	keepdir /var/lib/samba/{netlogon,profiles}
-	keepdir /var/lib/samba/printers/{W32X86,WIN40,W32ALPHA,W32MIPS,W32PPC}
-	keepdir /usr/$(get_libdir)/samba/{rpc,idmap,auth}
-
-	# docs
-	dodoc ${FILESDIR}/README.gentoo
-	dodoc ${S2}/{COPYING,Manifest,README,Roadmap,WHATSNEW.txt}
-	dodoc ${CONFDIR}/nsswitch.conf-wins
-	use winbind && dodoc ${CONFDIR}/nsswitch.conf-winbind
-
-	if use examples; then
-		docinto examples
-		cp -pPR ${S2}/examples/* ${D}/usr/share/doc/${PF}/examples
-		chmod -R 755 `find ${D}/usr/share/doc/${PF}/examples -type d`
-		chmod -R 644 `find ${D}/usr/share/doc/${PF}/examples ! -type d`
-	fi
-
-	if use oav; then
-		docinto ${PFVSCAN}
-		cd ${WORKDIR}/${PFVSCAN}
-		dodoc AUTHORS COPYING ChangeLog FAQ INSTALL NEWS README TODO
-		dodoc */*.conf
-	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
-
-	# Patch ChangeLog
-	docinto gentoo
-	dodoc ${PATCHDIR}/ChangeLog
-}
-
-pkg_preinst() {
-	local PRIVATE_SRC=/etc/samba/private
-	if [[ ! -r ${ROOT}/${PRIVATE_DST}/secrets.tdb \
-		&& -r ${ROOT}/${PRIVATE_SRC}/secrets.tdb ]]; then
-		ebegin "Copying ${ROOT}/${PRIVATE_SRC}/* to ${ROOT}/${PRIVATE_DST}/"
-			mkdir -p ${IMAGE}/${PRIVATE_DST}
-			cp -pPRf ${ROOT}/${PRIVATE_SRC}/* ${IMAGE}/${PRIVATE_DST}/
-		eend $?
-	fi
-
-	if [[ ! -f "${ROOT}/etc/samba/smb.conf" ]]; then
-		touch ${IMAGE}/etc/samba/smb.conf
-	fi
-}
-
-pkg_postinst() {
-	einfo "Latest info: README.gentoo in documentation directory"
-}
-
-pkg_postrm(){
-	# If stale docs, and one isn't re-emerging the latest version, removes
-	# (this is actually a portage bug, though)
-	[[ -n "${PF}" && ! -f ${ROOT}/usr/lib/${PN}/en.msg ]] && \
-		rm -rf ${ROOT}/usr/share/doc/${PF}
-}
-
diff --git a/net-fs/samba/samba-3.0.21b.ebuild b/net-fs/samba/samba-3.0.21b.ebuild
deleted file mode 100644
index 935736aef780..000000000000
--- a/net-fs/samba/samba-3.0.21b.ebuild
+++ /dev/null
@@ -1,308 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-fs/samba/samba-3.0.21b.ebuild,v 1.7 2006/03/14 20:35:16 chutzpah Exp $
-
-inherit eutils versionator
-
-IUSE_LINGUAS="ja pl"
-IUSE="acl async automount cups doc examples kerberos ldap ldapsam libclamav mysql
-	oav pam postgres python quotas readline selinux swat syslog winbind xml xml2"
-RESTRICT="test"
-
-VSCAN_VER="0.3.6b"
-PATCH_VER="0.3.11"
-MY_P=${PN}-${PV/_/}
-MY_PP=${PN}-$(get_major_version)-gentoo-${PATCH_VER}
-S2=${WORKDIR}/${MY_P}
-S=${S2}/source
-PFVSCAN=${PN}-vscan-${VSCAN_VER}
-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"
-SRC_URI="mirror://samba/${MY_P}.tar.gz
-	mirror://samba/old-versions/${MY_P}.tar.gz
-	oav? ( mirror://sourceforge/openantivirus/${PFVSCAN}.tar.bz2 )
-	mirror://gentoo/${MY_PP}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh ~sparc x86"
-
-RDEPEND="dev-libs/popt
-	acl?       ( sys-apps/acl )
-	cups?      ( net-print/cups )
-	ldap?      ( kerberos? ( virtual/krb5 ) net-nds/openldap )
-	mysql?     ( dev-db/mysql sys-libs/zlib )
-	pam?       ( virtual/pam )
-	postgres?  ( dev-db/postgresql sys-libs/zlib )
-	python?    ( dev-lang/python )
-	readline?  ( sys-libs/readline )
-	selinux?   ( sec-policy/selinux-samba )
-	swat?      ( sys-apps/xinetd )
-	syslog?    ( virtual/logger )
-	xml?       ( dev-libs/libxml2 sys-libs/zlib )
-	xml2?      ( dev-libs/libxml2 sys-libs/zlib )
-	"
-
-DEPEND="${RDEPEND}
-	sys-devel/autoconf
-	>=sys-apps/sed-4"
-
-PRIVATE_DST=/var/lib/samba/private
-PATCHDIR=${WORKDIR}/patches
-CONFDIR=${WORKDIR}/configs
-
-src_unpack() {
-	unpack ${A}; cd ${S2}
-
-	rm -rf ${S2}/examples.ORIG
-
-	export EPATCH_SUFFIX="patch"
-	epatch ${PATCHDIR}/general
-	if use oav ; then
-		cd ${WORKDIR}
-		epatch ${PATCHDIR}/vscan
-		cp -pPR ${WORKDIR}/${PFVSCAN} ${S2}/examples/VFS
-	fi
-
-	#uClib: bug #120383, https://bugzilla.samba.org/show_bug.cgi?id=3451
-	sed -i -e '/include.*fstab.h/d' "${S}"/client/umount.cifs.c
-}
-
-src_compile() {
-	ebegin "Running autoconf"
-		autoconf
-	eend $?
-
-	local myconf
-	local mymods
-	local mylangs
-
-	if use xml || use xml2 ; then
-		mymods="xml,${mymods}"
-	fi
-	use mysql && mymods="mysql,${mymods}"
-	use postgres && mymods="pgsql,${mymods}"
-	[[ -n "${mymods}" ]] && myconf="--with-expsam=${mymods}"
-
-	mylangs="en"
-	use linguas_ja && mylangs="${mylangs},ja"
-	use linguas_pl && mylangs="${mylangs},pl"
-	myconf="${myconf} --with-manpages-langs=${mylangs}"
-
-	if use ldap; then
-		myconf="${myconf} $(use_with ldap) $(use_with kerberos ads)"
-		myconf="${myconf} $(use_with ldapsam)"
-	else
-		myconf="${myconf} --without-ldapsam"
-	fi
-	use winbind && myconf="${myconf} $(use_with winbind) --with-shared-modules=idmap_rid"
-
-	[[ ${CHOST} == *-*bsd* ]] && myconf="${myconf} --disable-pie"
-
-	econf \
-		--with-fhs \
-		--sysconfdir=/etc/samba \
-		--localstatedir=/var \
-		--with-configdir=/etc/samba \
-		--with-libdir=/usr/$(get_libdir)/samba \
-		--with-swatdir=/usr/share/doc/${PF}/swat \
-		--with-piddir=/var/run/samba \
-		--with-lockdir=/var/cache/samba \
-		--with-logfilebase=/var/log/samba \
-		--with-privatedir=${PRIVATE_DST} \
-		--with-libsmbclient \
-		--without-spinlocks \
-		$(use_with acl acl-support) \
-		$(use_with async aio-support) \
-		$(use_with automount) \
-		$(use_enable cups) \
-		$(use_with kerberos krb5) \
-		$(use_with pam) $(use_with pam pam_smbpass) \
-		$(use_with python) \
-		$(use_with quotas) $(use_with quotas sys-quotas) \
-		$(use_with readline) \
-		$(use_with kernel_linux smbmount) \
-		$(use_with syslog) \
-		${myconf} || die
-
-	emake proto || die "SAMBA make proto error"
-	emake everything || die "SAMBA make everything error"
-
-	einfo "make rpctorture"
-	emake rpctorture || ewarn "rpctorture didn't build"
-
-	if use python ; then
-		python python/setup.py build
-	fi
-
-	# Build samba-vscan plugins
-	if use oav; then
-		cd ${S2}/examples/VFS/${PFVSCAN}
-		econf \
-			--with-fhs \
-			--libdir=/usr/$(get_libdir)/samba \
-			$(use_with libclamav) || die "${PFVSCAN} ./configure failed"
-		emake || die "Failed to make ${PFVSCAN}"
-	fi
-
-}
-
-src_install() {
-	local extra_bins="rpctorture"
-
-	make DESTDIR=${D} install-everything || die
-
-	# Extra rpctorture progs
-	exeinto /usr/bin
-	for i in ${extra_bins}; do
-		[[ -x ${S}/bin/${i} ]] && doexe ${S}/bin/${i}
-		einfo "Extra binaries: ${i}"
-	done
-
-	# remove .old stuff from /usr/bin:
-	rm -f ${D}/usr/bin/*.old
-
-	# Nsswitch extensions. Make link for wins and winbind resolvers
-	dolib.so ${S}/nsswitch/libnss_wins.so
-	dosym libnss_wins.so /usr/$(get_libdir)/libnss_wins.so.2
-	if use winbind; then
-		dolib.so ${S}/nsswitch/libnss_winbind.so
-		dosym libnss_winbind.so /usr/$(get_libdir)/libnss_winbind.so.2
-	fi
-
-	if use pam; then
-		exeinto /$(get_libdir)/security
-		doexe ${S}/bin/pam_smbpass.so
-		if use winbind; then
-			exeinto /$(get_libdir)/security
-			doexe ${S}/nsswitch/pam_winbind.so
-		fi
-	fi
-
-	if use kernel_linux; then
-		# mount backend
-		dodir /sbin
-		dosym ../usr/bin/smbmount /sbin/mount.smbfs
-		dosym ../usr/bin/mount.cifs /sbin/mount.cifs
-	fi
-
-	# bug #46389: samba doesn't create symlink anymore
-	# beaviour seems to be changed in 3.0.6, see bug #61046
-	dosym samba/libsmbclient.so /usr/$(get_libdir)/libsmbclient.so.0
-	dosym samba/libsmbclient.so /usr/$(get_libdir)/libsmbclient.so
-
-	# make the smb backend symlink for cups printing support..
-	if use cups; then
-		dodir /usr/$(get_libdir)/cups/backend
-		dosym ../../../bin/smbspool /usr/$(get_libdir)/cups/backend/smb
-	fi
-
-	# VFS plugin modules
-	if use oav; then
-		cd ${S2}/examples/VFS/${PFVSCAN}
-		make install DESTDIR=${D} || die "VFS: vscan error"
-		insinto /etc/samba
-		doins ${S2}/examples/VFS/${PFVSCAN}/openantivirus/*conf
-	fi
-
-	# Python extensions
-	if use python; then
-		cd ${S}
-		python python/setup.py install --root=${D} || die
-	fi
-
-	# General config files
-	insinto /etc/samba
-	doins ${CONFDIR}/smbusers
-	newins ${CONFDIR}/smb.conf.example-samba3 smb.conf.example
-	doins ${CONFDIR}/lmhosts
-
-	newpamd ${CONFDIR}/samba.pam samba
-	use winbind && doins ${CONFDIR}/system-auth-winbind
-	insinto /etc/xinetd.d
-	newins ${CONFDIR}/swat.xinetd swat
-	newinitd ${CONFDIR}/samba-init samba
-	newconfd ${CONFDIR}/samba-conf samba
-	if use ldap; then
-		insinto /etc/openldap/schema
-		doins ${S2}/examples/LDAP/samba.schema
-	fi
-
-	# dirs
-	diropts -m0700 ; keepdir ${PRIVATE_DST}
-	diropts -m1777 ; keepdir /var/spool/samba
-
-	diropts -m0755
-	keepdir /var/{log,run,cache}/samba
-	keepdir /var/lib/samba/{netlogon,profiles}
-	keepdir /var/lib/samba/printers/{W32X86,WIN40,W32ALPHA,W32MIPS,W32PPC}
-	keepdir /usr/$(get_libdir)/samba/{rpc,idmap,auth}
-
-	# docs
-	dodoc ${FILESDIR}/README.gentoo
-	dodoc ${S2}/{COPYING,Manifest,README,Roadmap,WHATSNEW.txt}
-	dodoc ${CONFDIR}/nsswitch.conf-wins
-	use winbind && dodoc ${CONFDIR}/nsswitch.conf-winbind
-
-	if use oav; then
-		docinto ${PFVSCAN}
-		cd ${WORKDIR}/${PFVSCAN}
-		dodoc AUTHORS COPYING ChangeLog FAQ INSTALL NEWS README TODO
-		dodoc */*.conf
-	fi
-
-	if use examples; then
-		docinto examples
-		cp -pPR ${S2}/examples/* ${D}/usr/share/doc/${PF}/examples
-		chmod -R 755 `find ${D}/usr/share/doc/${PF}/examples -type d`
-		chmod -R 644 `find ${D}/usr/share/doc/${PF}/examples ! -type d`
-	fi
-
-	if ! use doc; then
-		if ! use swat; then
-			rm -rf ${D}/usr/share/doc/${PF}/swat
-		else
-			rm -rf ${D}/usr/share/doc/${PF}/swat/help/{guide,howto,devel}
-			rm -rf ${D}/usr/share/doc/${PF}/swat/using_samba
-		fi
-	fi
-
-	# Patch ChangeLog
-	docinto gentoo
-	dodoc ${PATCHDIR}/ChangeLog
-}
-
-pkg_preinst() {
-	local PRIVATE_SRC=/etc/samba/private
-	if [[ ! -r ${ROOT}/${PRIVATE_DST}/secrets.tdb \
-		&& -r ${ROOT}/${PRIVATE_SRC}/secrets.tdb ]]; then
-		ebegin "Copying ${ROOT}/${PRIVATE_SRC}/* to ${ROOT}/${PRIVATE_DST}/"
-			mkdir -p ${IMAGE}/${PRIVATE_DST}
-			cp -pPRf ${ROOT}/${PRIVATE_SRC}/* ${IMAGE}/${PRIVATE_DST}/
-		eend $?
-	fi
-
-	if [[ ! -f "${ROOT}/etc/samba/smb.conf" ]]; then
-		touch ${IMAGE}/etc/samba/smb.conf
-	fi
-}
-
-pkg_postinst() {
-	if use swat; then
-		einfo "swat must be enabled by xinetd:"
-		einfo "    change the /etc/xinetd.d/swat configuration"
-	fi
-	einfo "As of 3.0.20: New USE flags: syslog, automount, async (default: disabled)"
-	einfo "As of 3.0.20b: New USE flags: ldapsam, swat (default: disabled)"
-	einfo "SQL and XML backends are *experimental*"
-	einfo "Latest info: README.gentoo in documentation directory"
-}
-
-pkg_postrm(){
-	# If stale docs, and one isn't re-emerging the latest version, removes
-	# (this is actually a portage bug, though)
-	[[ -n "${PF}" && ! -f ${ROOT}/usr/lib/${PN}/en.msg ]] && \
-		rm -rf ${ROOT}/usr/share/doc/${PF}
-}
-
diff --git a/net-fs/samba/samba-3.0.21c.ebuild b/net-fs/samba/samba-3.0.21c.ebuild
deleted file mode 100644
index 01cb860d3ccf..000000000000
--- a/net-fs/samba/samba-3.0.21c.ebuild
+++ /dev/null
@@ -1,308 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-fs/samba/samba-3.0.21c.ebuild,v 1.1 2006/02/24 17:57:31 satya Exp $
-
-inherit eutils versionator
-
-IUSE_LINGUAS="ja pl"
-IUSE="acl async automount cups doc examples kerberos ldap ldapsam libclamav mysql
-	oav pam postgres python quotas readline selinux swat syslog winbind xml xml2"
-RESTRICT="test"
-
-VSCAN_VER="0.3.6b"
-PATCH_VER="0.3.11"
-MY_P=${PN}-${PV/_/}
-MY_PP=${PN}-$(get_major_version)-gentoo-${PATCH_VER}
-S2=${WORKDIR}/${MY_P}
-S=${S2}/source
-PFVSCAN=${PN}-vscan-${VSCAN_VER}
-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"
-SRC_URI="mirror://samba/${MY_P}.tar.gz
-	mirror://samba/old-versions/${MY_P}.tar.gz
-	oav? ( mirror://sourceforge/openantivirus/${PFVSCAN}.tar.bz2 )
-	mirror://gentoo/${MY_PP}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
-
-RDEPEND="dev-libs/popt
-	acl?       ( sys-apps/acl )
-	cups?      ( net-print/cups )
-	ldap?      ( kerberos? ( virtual/krb5 ) net-nds/openldap )
-	mysql?     ( dev-db/mysql sys-libs/zlib )
-	pam?       ( virtual/pam )
-	postgres?  ( dev-db/postgresql sys-libs/zlib )
-	python?    ( dev-lang/python )
-	readline?  ( sys-libs/readline )
-	selinux?   ( sec-policy/selinux-samba )
-	swat?      ( sys-apps/xinetd )
-	syslog?    ( virtual/logger )
-	xml?       ( dev-libs/libxml2 sys-libs/zlib )
-	xml2?      ( dev-libs/libxml2 sys-libs/zlib )
-	"
-
-DEPEND="${RDEPEND}
-	sys-devel/autoconf
-	>=sys-apps/sed-4"
-
-PRIVATE_DST=/var/lib/samba/private
-PATCHDIR=${WORKDIR}/patches
-CONFDIR=${WORKDIR}/configs
-
-src_unpack() {
-	unpack ${A}; cd ${S2}
-
-	rm -rf ${S2}/examples.ORIG
-
-	export EPATCH_SUFFIX="patch"
-	epatch ${PATCHDIR}/general
-	if use oav ; then
-		cd ${WORKDIR}
-		epatch ${PATCHDIR}/vscan
-		cp -pPR ${WORKDIR}/${PFVSCAN} ${S2}/examples/VFS
-	fi
-
-	#uClib: bug #120383, https://bugzilla.samba.org/show_bug.cgi?id=3451
-	sed -i -e '/include.*fstab.h/d' "${S}"/client/umount.cifs.c
-}
-
-src_compile() {
-	ebegin "Running autoconf"
-		autoconf
-	eend $?
-
-	local myconf
-	local mymods
-	local mylangs
-
-	if use xml || use xml2 ; then
-		mymods="xml,${mymods}"
-	fi
-	use mysql && mymods="mysql,${mymods}"
-	use postgres && mymods="pgsql,${mymods}"
-	[[ -n "${mymods}" ]] && myconf="--with-expsam=${mymods}"
-
-	mylangs="en"
-	use linguas_ja && mylangs="${mylangs},ja"
-	use linguas_pl && mylangs="${mylangs},pl"
-	myconf="${myconf} --with-manpages-langs=${mylangs}"
-
-	if use ldap; then
-		myconf="${myconf} $(use_with ldap) $(use_with kerberos ads)"
-		myconf="${myconf} $(use_with ldapsam)"
-	else
-		myconf="${myconf} --without-ldapsam"
-	fi
-	use winbind && myconf="${myconf} $(use_with winbind) --with-shared-modules=idmap_rid"
-
-	[[ ${CHOST} == *-*bsd* ]] && myconf="${myconf} --disable-pie"
-
-	econf \
-		--with-fhs \
-		--sysconfdir=/etc/samba \
-		--localstatedir=/var \
-		--with-configdir=/etc/samba \
-		--with-libdir=/usr/$(get_libdir)/samba \
-		--with-swatdir=/usr/share/doc/${PF}/swat \
-		--with-piddir=/var/run/samba \
-		--with-lockdir=/var/cache/samba \
-		--with-logfilebase=/var/log/samba \
-		--with-privatedir=${PRIVATE_DST} \
-		--with-libsmbclient \
-		--without-spinlocks \
-		$(use_with acl acl-support) \
-		$(use_with async aio-support) \
-		$(use_with automount) \
-		$(use_enable cups) \
-		$(use_with kerberos krb5) \
-		$(use_with pam) $(use_with pam pam_smbpass) \
-		$(use_with python) \
-		$(use_with quotas) $(use_with quotas sys-quotas) \
-		$(use_with readline) \
-		$(use_with kernel_linux smbmount) \
-		$(use_with syslog) \
-		${myconf} || die
-
-	emake proto || die "SAMBA make proto error"
-	emake everything || die "SAMBA make everything error"
-
-	einfo "make rpctorture"
-	emake rpctorture || ewarn "rpctorture didn't build"
-
-	if use python ; then
-		python python/setup.py build
-	fi
-
-	# Build samba-vscan plugins
-	if use oav; then
-		cd ${S2}/examples/VFS/${PFVSCAN}
-		econf \
-			--with-fhs \
-			--libdir=/usr/$(get_libdir)/samba \
-			$(use_with libclamav) || die "${PFVSCAN} ./configure failed"
-		emake || die "Failed to make ${PFVSCAN}"
-	fi
-
-}
-
-src_install() {
-	local extra_bins="rpctorture"
-
-	make DESTDIR=${D} install-everything || die
-
-	# Extra rpctorture progs
-	exeinto /usr/bin
-	for i in ${extra_bins}; do
-		[[ -x ${S}/bin/${i} ]] && doexe ${S}/bin/${i}
-		einfo "Extra binaries: ${i}"
-	done
-
-	# remove .old stuff from /usr/bin:
-	rm -f ${D}/usr/bin/*.old
-
-	# Nsswitch extensions. Make link for wins and winbind resolvers
-	dolib.so ${S}/nsswitch/libnss_wins.so
-	dosym libnss_wins.so /usr/$(get_libdir)/libnss_wins.so.2
-	if use winbind; then
-		dolib.so ${S}/nsswitch/libnss_winbind.so
-		dosym libnss_winbind.so /usr/$(get_libdir)/libnss_winbind.so.2
-	fi
-
-	if use pam; then
-		exeinto /$(get_libdir)/security
-		doexe ${S}/bin/pam_smbpass.so
-		if use winbind; then
-			exeinto /$(get_libdir)/security
-			doexe ${S}/nsswitch/pam_winbind.so
-		fi
-	fi
-
-	if use kernel_linux; then
-		# mount backend
-		dodir /sbin
-		dosym ../usr/bin/smbmount /sbin/mount.smbfs
-		dosym ../usr/bin/mount.cifs /sbin/mount.cifs
-	fi
-
-	# bug #46389: samba doesn't create symlink anymore
-	# beaviour seems to be changed in 3.0.6, see bug #61046
-	dosym samba/libsmbclient.so /usr/$(get_libdir)/libsmbclient.so.0
-	dosym samba/libsmbclient.so /usr/$(get_libdir)/libsmbclient.so
-
-	# make the smb backend symlink for cups printing support..
-	if use cups; then
-		dodir /usr/$(get_libdir)/cups/backend
-		dosym ../../../bin/smbspool /usr/$(get_libdir)/cups/backend/smb
-	fi
-
-	# VFS plugin modules
-	if use oav; then
-		cd ${S2}/examples/VFS/${PFVSCAN}
-		make install DESTDIR=${D} || die "VFS: vscan error"
-		insinto /etc/samba
-		doins ${S2}/examples/VFS/${PFVSCAN}/openantivirus/*conf
-	fi
-
-	# Python extensions
-	if use python; then
-		cd ${S}
-		python python/setup.py install --root=${D} || die
-	fi
-
-	# General config files
-	insinto /etc/samba
-	doins ${CONFDIR}/smbusers
-	newins ${CONFDIR}/smb.conf.example-samba3 smb.conf.example
-	doins ${CONFDIR}/lmhosts
-
-	newpamd ${CONFDIR}/samba.pam samba
-	use winbind && doins ${CONFDIR}/system-auth-winbind
-	insinto /etc/xinetd.d
-	newins ${CONFDIR}/swat.xinetd swat
-	newinitd ${CONFDIR}/samba-init samba
-	newconfd ${CONFDIR}/samba-conf samba
-	if use ldap; then
-		insinto /etc/openldap/schema
-		doins ${S2}/examples/LDAP/samba.schema
-	fi
-
-	# dirs
-	diropts -m0700 ; keepdir ${PRIVATE_DST}
-	diropts -m1777 ; keepdir /var/spool/samba
-
-	diropts -m0755
-	keepdir /var/{log,run,cache}/samba
-	keepdir /var/lib/samba/{netlogon,profiles}
-	keepdir /var/lib/samba/printers/{W32X86,WIN40,W32ALPHA,W32MIPS,W32PPC}
-	keepdir /usr/$(get_libdir)/samba/{rpc,idmap,auth}
-
-	# docs
-	dodoc ${FILESDIR}/README.gentoo
-	dodoc ${S2}/{COPYING,Manifest,README,Roadmap,WHATSNEW.txt}
-	dodoc ${CONFDIR}/nsswitch.conf-wins
-	use winbind && dodoc ${CONFDIR}/nsswitch.conf-winbind
-
-	if use oav; then
-		docinto ${PFVSCAN}
-		cd ${WORKDIR}/${PFVSCAN}
-		dodoc AUTHORS COPYING ChangeLog FAQ INSTALL NEWS README TODO
-		dodoc */*.conf
-	fi
-
-	if use examples; then
-		docinto examples
-		cp -pPR ${S2}/examples/* ${D}/usr/share/doc/${PF}/examples
-		chmod -R 755 `find ${D}/usr/share/doc/${PF}/examples -type d`
-		chmod -R 644 `find ${D}/usr/share/doc/${PF}/examples ! -type d`
-	fi
-
-	if ! use doc; then
-		if ! use swat; then
-			rm -rf ${D}/usr/share/doc/${PF}/swat
-		else
-			rm -rf ${D}/usr/share/doc/${PF}/swat/help/{guide,howto,devel}
-			rm -rf ${D}/usr/share/doc/${PF}/swat/using_samba
-		fi
-	fi
-
-	# Patch ChangeLog
-	docinto gentoo
-	dodoc ${PATCHDIR}/ChangeLog
-}
-
-pkg_preinst() {
-	local PRIVATE_SRC=/etc/samba/private
-	if [[ ! -r ${ROOT}/${PRIVATE_DST}/secrets.tdb \
-		&& -r ${ROOT}/${PRIVATE_SRC}/secrets.tdb ]]; then
-		ebegin "Copying ${ROOT}/${PRIVATE_SRC}/* to ${ROOT}/${PRIVATE_DST}/"
-			mkdir -p ${IMAGE}/${PRIVATE_DST}
-			cp -pPRf ${ROOT}/${PRIVATE_SRC}/* ${IMAGE}/${PRIVATE_DST}/
-		eend $?
-	fi
-
-	if [[ ! -f "${ROOT}/etc/samba/smb.conf" ]]; then
-		touch ${IMAGE}/etc/samba/smb.conf
-	fi
-}
-
-pkg_postinst() {
-	if use swat; then
-		einfo "swat must be enabled by xinetd:"
-		einfo "    change the /etc/xinetd.d/swat configuration"
-	fi
-	einfo "As of 3.0.20: New USE flags: syslog, automount, async (default: disabled)"
-	einfo "As of 3.0.20b: New USE flags: ldapsam, swat (default: disabled)"
-	einfo "SQL and XML backends are *experimental*"
-	einfo "Latest info: README.gentoo in documentation directory"
-}
-
-pkg_postrm(){
-	# If stale docs, and one isn't re-emerging the latest version, removes
-	# (this is actually a portage bug, though)
-	[[ -n "${PF}" && ! -f ${ROOT}/usr/lib/${PN}/en.msg ]] && \
-		rm -rf ${ROOT}/usr/share/doc/${PF}
-}
-