prune old ebuilds

10 files changed, 6 insertions, 1667 deletions

diff --git a/net-fs/samba/ChangeLog b/net-fs/samba/ChangeLog
index f32f9003e00c..d22200944184 100644
--- a/net-fs/samba/ChangeLog
+++ b/net-fs/samba/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-fs/samba
 # Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-fs/samba/ChangeLog,v 1.75 2004/05/04 22:27:05 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-fs/samba/ChangeLog,v 1.76 2004/05/10 18:43:06 mr_bones_ Exp $
+
+  10 May 2004; Michael Sterrett <mr_bones_@gentoo.org> samba-2.2.8a.ebuild,
+  samba-3.0.0-r1.ebuild, samba-3.0.1.ebuild, samba-3.0.2a-r1.ebuild:
+  prune old ebuilds
 
   04 May 2004; Michael Sterrett <mr_bones_@gentoo.org> samba-3.0.2a.ebuild:
   clean extra ebuild
diff --git a/net-fs/samba/Manifest b/net-fs/samba/Manifest
index 57745b918b28..da033acfa1f5 100644
--- a/net-fs/samba/Manifest
+++ b/net-fs/samba/Manifest
@@ -1,15 +1,8 @@
-MD5 d39d64d24cf682ae49aff595b2e7836a ChangeLog 15682
-MD5 a14d55690d52d6770c50855d7fd48efd samba-2.2.8a.ebuild 10853
-MD5 e49613d30093a41ce2883cf670cbe11f samba-3.0.0-r1.ebuild 10860
-MD5 d5164790d64a6f7b353475b65104f1ea samba-3.0.1.ebuild 11320
+MD5 39522cedb748f514dac1a5ca42699cad ChangeLog 15848
 MD5 9dc4a618b56b5e6b4386523dd9c869c9 metadata.xml 373
 MD5 70172eea79bd0ccb6f357d1dba8803a2 samba-3.0.1-r1.ebuild 11339
-MD5 387ee977d885cbccc2dd79cb07ada060 samba-3.0.2a-r1.ebuild 12243
 MD5 91506fedb613a6384ec5a089c4b1b6a5 samba-3.0.2a-r2.ebuild 12142
 MD5 fd2382184b6a07e63cb07ff26b578fd2 files/config-svc-smbd+nmbd 784
-MD5 f3a4b3b0a8162ae87779846d7e6adbbf files/digest-samba-3.0.1 202
-MD5 9780745de080ee53a34c1b2f9fb1f228 files/digest-samba-2.2.8a 135
-MD5 9ad118eb4f2d3eff69927ab1ab1913be files/digest-samba-3.0.0-r1 202
 MD5 f3a4b3b0a8162ae87779846d7e6adbbf files/digest-samba-3.0.1-r1 202
 MD5 b610fd35d7a0a9de510e31d85345d14a files/lmhosts 124
 MD5 f402c2c4103f4c13ac3cc5fa165940db files/nonroot-bind.diff 757
@@ -32,6 +25,5 @@ MD5 3721b81198a029319546e6ef56e5c493 files/smbusers 202
 MD5 ba636412fdffb621dcd28e79fb247d7c files/swat.xinetd 525
 MD5 ce5400ed75143be061711d2c1d51a081 files/system-auth-winbind 867
 MD5 d95c7a841071087246ef23a1f72b890f files/winbind-init 491
-MD5 89ef79072e3e08e4caada278e2c3b280 files/digest-samba-3.0.2a-r1 204
 MD5 990fe15ff8a0e79f39069fff6475536d files/samba-3.0.2a-smbprint.patch 1224
 MD5 89ef79072e3e08e4caada278e2c3b280 files/digest-samba-3.0.2a-r2 204
diff --git a/net-fs/samba/files/digest-samba-2.2.8a b/net-fs/samba/files/digest-samba-2.2.8a
deleted file mode 100644
index 79fbefe7c7f8..000000000000
--- a/net-fs/samba/files/digest-samba-2.2.8a
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 a1399b9e297f51bd18cb21339a3f8f67 samba-vscan-0.3.2.tar.bz2 68127
-MD5 51466fdd7b7125a5bd41608a76e8e7c8 samba-2.2.8a.tar.bz2 4505672
diff --git a/net-fs/samba/files/digest-samba-3.0.0-r1 b/net-fs/samba/files/digest-samba-3.0.0-r1
deleted file mode 100644
index 51eb000cdaf1..000000000000
--- a/net-fs/samba/files/digest-samba-3.0.0-r1
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 f54ba49f9a5ef6090272acf8db2e066d samba-3.0.0.tar.bz2 9848974
-MD5 acbcb28cff080dcf2ee732b7f2c0f949 samba-vscan-0.3.4.tar.bz2 131027
-MD5 61858aa44ebc68b485fb9dac2749e82c smbldap-tools-0.8.1.tgz 51142
diff --git a/net-fs/samba/files/digest-samba-3.0.1 b/net-fs/samba/files/digest-samba-3.0.1
deleted file mode 100644
index 37ce22efcace..000000000000
--- a/net-fs/samba/files/digest-samba-3.0.1
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 2a3d494f139ab7402d8902b0e68c463f samba-3.0.1.tar.bz2 8303432
-MD5 acbcb28cff080dcf2ee732b7f2c0f949 samba-vscan-0.3.4.tar.bz2 131027
-MD5 3998eddca7110a98c99f06210e295b84 smbldap-tools-0.8.2.tgz 57571
diff --git a/net-fs/samba/files/digest-samba-3.0.2a-r1 b/net-fs/samba/files/digest-samba-3.0.2a-r1
deleted file mode 100644
index 87a8e61d1838..000000000000
--- a/net-fs/samba/files/digest-samba-3.0.2a-r1
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 72979a30ac450c8b0567c1ac9886884a samba-3.0.2a.tar.bz2 9289178
-MD5 acbcb28cff080dcf2ee732b7f2c0f949 samba-vscan-0.3.4.tar.bz2 131027
-MD5 34ef159fc49a2c30ff27b481dc8e1215 smbldap-tools-0.8.4.tgz 286290
diff --git a/net-fs/samba/samba-2.2.8a.ebuild b/net-fs/samba/samba-2.2.8a.ebuild
deleted file mode 100644
index 084d95158054..000000000000
--- a/net-fs/samba/samba-2.2.8a.ebuild
+++ /dev/null
@@ -1,397 +0,0 @@
-# Copyright 1999-2004 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-fs/samba/samba-2.2.8a.ebuild,v 1.6 2004/03/23 10:02:20 kumba Exp $
-
-inherit eutils
-
-IUSE="pam acl cups ldap ssl tcpd"
-IUSE="${IUSE} oav"
-
-VSCAN_VER=0.3.2
-VSCAN_MODS=${VSCAN_MODS:=fprot mks openantivirus sophos trend icap} #kapersky
-# To build the "kapersky" plugin, the kapersky lib must be installed.
-
-DESCRIPTION="SAMBA is a suite of SMB and CIFS client/server programs for UNIX"
-HOMEPAGE="http://www.samba.org"
-
-S=${WORKDIR}/${P}
-SRC_URI="oav? mirror://sourceforge/openantivirus/${PN}-vscan-${VSCAN_VER}.tar.bz2
-	mirror://samba/${P}.tar.bz2"
-DEPEND="pam? >=sys-libs/pam-0.72
-	acl? sys-apps/acl
-	cups? net-print/cups
-	ldap? =net-nds/openldap-2*
-	ssl? >=dev-libs/openssl-0.9.6
-	tcpd? >=sys-apps/tcp-wrappers-7.6
-	oav? >=dev-libs/popt-1.6.3"
-KEYWORDS="x86 ppc sparc alpha hppa amd64 ~mips"
-LICENSE="GPL-2"
-SLOT="0"
-
-src_unpack() {
-	local i
-	unpack ${A} || die
-	cd ${S} || die
-
-	epatch ${FILESDIR}/samba-2.2.5-gp-reloc-fix.patch
-
-	if use portldap; then
-		cd ${S}/source
-		epatch $FILESDIR/nonroot-bind.diff
-	fi
-
-	if use ldap; then
-		cd ${S}
-		epatch ${FILESDIR}/samba-2.2.6-libresolv.patch
-	fi
-
-	# fix kerberos include file collision..
-	# --still an issue? :/
-	cd ${S}/source/include
-	mv profile.h smbprofile.h
-	sed -e "s:profile\.h:smbprofile.h:" includes.h > includes.h.new
-	mv includes.h.new includes.h
-
-	# for clean docs packaging sake, make a copy..
-	cp -a ${S}/examples ${S}/examples.bin
-	# prep the samba-vscan source
-	use oav && \
-	cp -a ${WORKDIR}/${PN}-vscan-${VSCAN_VER} ${S}/examples.bin/VFS
-
-	# Add a patch for sparc to fix bug #27858
-	if [ "${ARCH}" = "sparc" ]
-	then
-		cd ${S}/source/include
-		epatch ${FILESDIR}/samba-2.2.8-statfs.patch
-	fi
-
-	cd ${S}/source
-	autoconf || die
-}
-
-src_compile() {
-	local i myconf
-	use acl && myconf="--with-acl-support" \
-		||  myconf="--without-acl-support"
-
-	use ssl && myconf="${myconf} --with-ssl" \
-		|| myconf="${myconf} --without-ssl"
-
-	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-ldapsam --with-winbind-ldap-hack" \
-		|| myconf="${myconf} --without-ldapsam"
-
-	cd ${S}/source
-	./configure \
-		--prefix=/usr \
-		--bindir=/usr/sbin \
-		--libdir=/etc/samba \
-		--sbindir=/usr/sbin \
-		--sysconfdir=/etc/samba \
-		--localstatedir=/var/log \
-		--with-configdir=/etc/samba \
-		--with-mandir=/usr/share/man \
-		--with-piddir=/var/run/samba \
-		--with-swatdir=/usr/share/swat \
-		--with-lockdir=/var/cache/samba \
-		--with-privatedir=/etc/samba/private \
-		--with-codepagedir=/var/lib/samba/codepages \
-		--with-winbind-auth-challenge \
-		--with-sendfile-support \
-		--without-smbwrapper \
-		--without-sambabook \
-		--without-automount \
-		--without-spinlocks \
-		--with-libsmbclient \
-		--with-netatalk \
-		--with-smbmount \
-		--with-profile \
-		--with-quotas \
-		--with-syslog \
-		--with-msdfs \
-		--with-utmp \
-		--with-vfs \
-		--host=${CHOST} ${myconf} || die "bad ./configure"
-
-	# compile samba..
-	make all smbfilter smbcacls \
-		nsswitch nsswitch/libnss_wins.so debug2html
-	assert "samba compile problem"
-	if use pam; then
-		make pam_smbpass || die "pam_smbpass compile problem"
-	fi
-
-	# compile the bundled vfs modules..
-	cd ${S}/examples.bin/VFS
-	./configure \
-		--prefix=/usr \
-		--mandir=/usr/share/man || die "bad ./configure"
-	make || die "VFS modules compile problem"
-
-	# compile the selected antivirus vfs plugins..
-	if use oav; then
-		for i in ${VSCAN_MODS}
-		do
-			cd ${S}/examples.bin/VFS/${PN}-vscan-${VSCAN_VER}/$i
-			make USE_INCLMKSDLIB=1 #needed for the mks build
-			assert "problem building $i vscan module"
-		done
-	fi
-
-	# compile mkntpasswd in examples/LDAP/ for smbldaptools..
-	if use ldap; then
-		cd ${S}/examples.bin/LDAP/smbldap-tools/mkntpwd
-		VISUAL="" make || die "mkntpwd compile problem"
-	fi
-}
-
-src_install() {
-	local i
-
-	# we may as well do this all manually since it was starting
-	# to get out of control and samba _does_ have some rather
-	# silly installation quirks ;)  much of this was adapted
-	# from mandrake's .spec file.. // woodchip - 5 May 2002
-
-	# install standard binary files..
-	for i in nmblookup smbclient smbpasswd smbstatus testparm testprns \
-		make_smbcodepage make_unicodemap make_printerdef rpcclient \
-		smbspool smbcacls smbclient smbmount smbumount wbinfo
-		#smbsh (broke)
-	do
-		exeinto /usr/bin
-		doexe source/bin/${i}
-	done
-	# make users lives easier..
-	fperms 4755 /usr/bin/smbumount
-
-
-	# secure binary files..
-	for i in smbd nmbd swat smbfilter debug2html smbmnt smbcontrol winbindd
-	do
-		exeinto /usr/sbin
-		doexe source/bin/${i}
-	done
-	# make users lives easier..
-	fperms 4755 /usr/sbin/smbmnt
-
-
-	# some utility scripts..
-	for i in mksmbpasswd.sh smbtar convert_smbpasswd
-	do
-		exeinto /usr/bin
-		doexe source/script/${i}
-	done
-	# and this handy one..
-	doexe packaging/Mandrake/findsmb
-
-
-	# utilities from LDAP/smbldap-tools
-	if use ldap; then
-		exeinto /usr/share/samba/smbldap-tools
-		doexe examples/LDAP/smbldap-tools/*.pl
-		doexe examples/LDAP/smbldap-tools/smbldap_tools.pm
-		doexe examples/LDAP/{import,export}_smbpasswd.pl
-		chmod 0700 ${D}/usr/share/samba/smbldap-tools/{import,export}_smbpasswd.pl
-		exeinto /usr/sbin
-		doexe examples.bin/LDAP/smbldap-tools/mkntpwd/mkntpwd
-		#dodir /usr/lib/perl5/site_perl/5.6.1
-		eval `perl '-V:installarchlib'`
-		dodir ${installarchlib}
-		dosym /etc/samba/smbldap_conf.pm ${installarchlib}
-		dosym /usr/share/samba/smbldap-tools/smbldap_tools.pm ${installarchlib}
-	fi
-
-
-	# libraries..
-	exeinto /usr/lib
-	#broke
-	#doexe source/bin/smbwrapper.so
-	doexe source/bin/libsmbclient.so
-	insinto /usr/lib
-	doins source/bin/libsmbclient.a
-	insinto /usr/include
-	doins source/include/libsmbclient.h
-	exeinto /lib/security
-	doexe source/nsswitch/pam_winbind.so
-	use pam && doexe source/bin/pam_smbpass.so
-
-
-	# nsswitch library extension files..
-	for i in wins winbind
-	do
-		exeinto /lib
-		doexe source/nsswitch/libnss_${i}.so
-	done
-	# make link for wins and winbind resolvers..
-	( cd ${D}/lib ; ln -s libnss_wins.so libnss_wins.so.2 )
-	( cd ${D}/lib ; ln -s libnss_winbind.so libnss_winbind.so.2 )
-
-
-	# vfs modules..
-	exeinto /usr/lib/samba/vfs
-	doexe examples.bin/VFS/audit.so
-	doexe examples.bin/VFS/block/block.so
-	doexe examples.bin/VFS/recycle/recycle.so
-	use oav && \
-	doexe examples.bin/VFS/${PN}-vscan-${VSCAN_VER}/*/vscan-*.so
-
-
-	# codepage source files..
-	for i in 437 737 775 850 852 857 861 862 866 932 936 949 950 1125 1251
-	do
-		insinto /var/lib/samba/codepages/src
-		doins source/codepages/codepage_def.${i}
-	done
-	for i in 437 737 775 850 852 857 861 862 866 932 936 949 950 1125 1251 \
-		ISO8859-1 ISO8859-2 ISO8859-5 ISO8859-7 \
-		ISO8859-9 ISO8859-13 ISO8859-15 KOI8-R KOI8-U
-	do
-		insinto /var/lib/samba/codepages/src
-		doins source/codepages/CP${i}.TXT
-	done
-
-
-	# build codepage load files..
-	for i in 437 737 775 850 852 857 861 862 866 932 936 949 950 1125 1251
-	do
-		${D}/usr/bin/make_smbcodepage c ${i} \
-			${D}/var/lib/samba/codepages/src/codepage_def.${i} \
-			${D}/var/lib/samba/codepages/codepage.${i}
-	done
-	# build unicode load files..
-	for i in 437 737 775 850 852 857 861 862 866 932 936 949 950 1125 1251 \
-		ISO8859-1 ISO8859-2 ISO8859-5 ISO8859-7 \
-		ISO8859-9 ISO8859-13 ISO8859-15 KOI8-R KOI8-U
-	do
-		${D}/usr/bin/make_unicodemap ${i} \
-			${D}/var/lib/samba/codepages/src/CP${i}.TXT \
-			${D}/var/lib/samba/codepages/unicode_map.${i}
-	done
-	rm -rf ${D}/var/lib/samba/codepages/src
-
-
-	# install SWAT helper files..
-	for i in swat/help/*.html docs/htmldocs/*.html
-	do
-		insinto /usr/share/swat/help
-		doins ${i}
-	done
-	for i in swat/images/*.gif
-	do
-		insinto /usr/share/swat/images
-		doins ${i}
-	done
-	for i in swat/include/*.html
-	do
-		insinto /usr/share/swat/include
-		doins ${i}
-	done
-
-
-	# install the O'Reilly "Using Samba" book..
-	for i in docs/htmldocs/using_samba/*.html
-	do
-		insinto /usr/share/swat/using_samba
-		doins ${i}
-	done
-	for i in docs/htmldocs/using_samba/gifs/*.gif
-	do
-		insinto /usr/share/swat/using_samba/gifs
-		doins ${i}
-	done
-	for i in docs/htmldocs/using_samba/figs/*.gif
-	do
-		insinto /usr/share/swat/using_samba/figs
-		doins ${i}
-	done
-
-
-	# man pages..
-	doman docs/manpages/*
-
-
-	# attempt to install all the docs as easily as possible :/
-	# we don't want two copies of the book or manpages
-	rm -rf docs/htmldocs/using_samba docs/manpages
-	dodoc COPYING Manifest README Roadmap WHATSNEW.txt
-	docinto full_docs
-	cp -a docs/* ${D}/usr/share/doc/${PF}/full_docs
-	docinto examples
-	cp -a examples/* ${D}/usr/share/doc/${PF}/examples
-	prepalldocs
-	# keep this next line *after* prepalldocs!
-	dosym /usr/share/swat/using_samba /usr/share/doc/${PF}/using_samba
-	# and we should unzip the html docs..
-	gunzip ${D}/usr/share/doc/${PF}/full_docs/faq/*
-	gunzip ${D}/usr/share/doc/${PF}/full_docs/htmldocs/*
-	if use oav; then
-		docinto ${PN}-vscan-${VSCAN_VER}
-		cd ${WORKDIR}/${PN}-vscan-${VSCAN_VER}
-		dodoc AUTHORS COPYING ChangeLog FAQ INSTALL NEWS README TODO
-		dodoc */*.conf
-	fi
-
-
-	# link /usr/bin/smbmount to /sbin/mount.smbfs which allows it
-	# to work transparently with the standard 'mount' command..
-	dodir /sbin
-	dosym /usr/bin/smbmount /sbin/mount.smbfs
-
-
-	# make the smb backend symlink for cups printing support..
-	if use cups; then
-		dodir /usr/lib/cups/backend
-		dosym /usr/bin/smbspool /usr/lib/cups/backend/smb
-	fi
-
-
-	# now the config files..
-	insinto /etc
-	doins ${FILESDIR}/nsswitch.conf-winbind
-	doins ${FILESDIR}/nsswitch.conf-wins
-
-	insinto /etc/samba
-	doins ${FILESDIR}/smbusers
-	doins ${FILESDIR}/smb.conf.example
-	doins ${FILESDIR}/lmhosts
-	doins ${FILESDIR}/recycle.conf
-	if use ldap; then
-		doins ${FILESDIR}/smbldap_conf.pm
-		doins ${FILESDIR}/samba-slapd-include.conf
-	fi
-
-	insinto /etc/pam.d
-	newins ${FILESDIR}/samba.pam samba
-	doins ${FILESDIR}/system-auth-winbind
-
-	exeinto /etc/init.d
-	newexe ${FILESDIR}/samba-init samba
-	newexe ${FILESDIR}/winbind-init winbind
-
-	insinto /etc/xinetd.d
-	newins ${FILESDIR}/swat.xinetd swat
-}
-
-pkg_postinst() {
-	# touch /etc/samba/smb.conf so that people installing samba just
-	# to mount smb shares don't get annoying warnings all the time..
-	if [ ! -e ${ROOT}/etc/samba/smb.conf ] ; then
-		touch ${ROOT}/etc/samba/smb.conf
-	fi
-
-	# empty dirs..
-	install -m0700 -o root -g root -d ${ROOT}/etc/samba/private
-	install -m1777 -o root -g root -d ${ROOT}/var/spool/samba
-	install -m0755 -o root -g root -d ${ROOT}/var/log/samba
-	install -m0755 -o root -g root -d ${ROOT}/var/run/samba
-	install -m0755 -o root -g root -d ${ROOT}/var/cache/samba
-	install -m0755 -o root -g root -d ${ROOT}/var/lib/samba/{netlogon,profiles}
-	install -m0755 -o root -g root -d \
-		${ROOT}/var/lib/samba/printers/{W32X86,WIN40,W32ALPHA,W32MIPS,W32PPC}
-}
diff --git a/net-fs/samba/samba-3.0.0-r1.ebuild b/net-fs/samba/samba-3.0.0-r1.ebuild
deleted file mode 100644
index 94e2a355e36a..000000000000
--- a/net-fs/samba/samba-3.0.0-r1.ebuild
+++ /dev/null
@@ -1,393 +0,0 @@
-# Copyright 1999-2004 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-fs/samba/samba-3.0.0-r1.ebuild,v 1.9 2004/03/23 15:11:15 avenj Exp $
-
-inherit eutils
-
-IUSE="kerberos mysql xml acl cups ldap pam readline python"
-IUSE="${IUSE} oav"
-
-DESCRIPTION="SAMBA is a suite of SMB and CIFS client/server programs for UNIX"
-HOMEPAGE="http://www.samba.org/
-	http://www.openantivirus.org/projects.php"
-
-SMBLDAP_TOOLS_VER=0.8.1
-VSCAN_VER=0.3.4
-VSCAN_MODS=${VSCAN_MODS:=fprot mks openantivirus sophos trend icap clamav} #kapersky
-# To build the "kapersky" plugin, the kapersky lib must be installed.
-
-_CVS="-${PV/_/}"
-S=${WORKDIR}/${PN}${_CVS}
-
-SRC_URI="mirror://samba/${PN}${_CVS}.tar.bz2
-	oav? mirror://sourceforge/openantivirus/${PN}-vscan-${VSCAN_VER}.tar.bz2
-	ldap? http://samba.idealx.org/dist/smbldap-tools-${SMBLDAP_TOOLS_VER}.tgz"
-
-_COMMON_DEPS="dev-libs/popt
-	readline? sys-libs/readline
-	kerberos? ( app-crypt/mit-krb5 )
-	mysql? ( dev-db/mysql sys-libs/zlib )
-	acl? sys-apps/acl
-	cups? net-print/cups
-	ldap? net-nds/openldap
-	pam? sys-libs/pam
-	python? dev-lang/python"
-DEPEND="sys-devel/autoconf ${_COMMON_DEPS}"
-#IDEALX scripts are now using Net::LDAP
-RDEPEND="ldap? dev-perl/perl-ldap ${_COMMON_DEPS}"
-
-KEYWORDS="~x86 ppc ~sparc ~mips hppa amd64 "
-LICENSE="GPL-2"
-SLOT="0"
-
-src_unpack() {
-	local i
-	unpack ${A} || die
-	cd ${S} || die
-
-	# Clean up CVS
-	#find . -name .cvsignore | xargs rm -f
-	#find . -name CVS | xargs rm -rf
-
-	# Add patch(es)
-	#Next one is from eger@cc.gatech.edu :)
-	patch -p1 <${FILESDIR}/samba-3.0.0-python-setup.patch || die
-	#Fix for bug #27858
-	if [ "${ARCH}" = "sparc" ]
-	then
-		cd ${S}/source/include
-		epatch ${FILESDIR}/samba-2.2.8-statfs.patch
-	fi
-
-	# For clean docs packaging sake.
-	rm -rf ${S}/examples.bin ; cp -a ${S}/examples ${S}/examples.bin
-
-	# Prep samba-vscan source.
-	if use oav; then
-		cp -a ${WORKDIR}/${PN}-vscan-${VSCAN_VER} ${S}/examples.bin/VFS
-	fi
-
-	cd ${S}/source
-	autoconf || die
-}
-
-src_compile() {
-	local i
-	local myconf
-	local mymods
-
-	#this is deprecated...
-	#mymods="nisplussam"
-	use xml && mymods="xml,${mymods}"
-	use mysql && mymods="mysql,${mymods}"
-
-	myconf="--with-expsam=${mymods}"
-
-	use acl \
-		&& myconf="${myconf} --with-acl-support" \
-		|| myconf="${myconf} --without-acl-support"
-
-	use pam \
-		&& myconf="${myconf} --with-pam --with-pam_smbpass" \
-		|| myconf="${myconf} --without-pam --without-pam_smbpass"
-
-	use cups \
-		&& myconf="${myconf} --enable-cups" \
-		|| myconf="${myconf} --disable-cups"
-
-	use ldap \
-		&& myconf="${myconf} --with-ldap" \
-		|| myconf="${myconf} --without-ldap"
-		#this is for old samba 2.x compat
-		#myconf="${myconf} --with-ldapsam" 
-		myconf="${myconf} --without-ldapsam"
-
-	if [ "${ARCH}" != "amd64" ]
-	then
-		use kerberos \
-			&& myconf="${myconf} --with-ads" \
-			|| myconf="${myconf} --without-ads"
-	else
-		myconf="${myconf} --without-ads"
-	fi
-
-	use python \
-		&& myconf="${myconf} --with-python=yes" \
-		|| myconf="${myconf} --with-python=no"
-
-	use readline \
-		&& myconf="${myconf} --with-readline" \
-		|| myconf="${myconf} --without-readline"
-
-	einfo "\$myconf is: $myconf"
-
-	#default_{static,shared}_modules|source/configure
-	#/usr/lib/samba/auth/.............      AUTH_MODULES
-	#/usr/lib/samba/charset/                CHARSET_MODULES
-	#/usr/lib/samba/pdb/..............      PDB_MODULES
-	#/usr/lib/samba/rpc/                    RPC_MODULES
-	#/usr/lib/samba/vfs/..............      VFS_MODULES|source/Makefile
-	#/usr/lib/samba/lowcase.dat
-	#/usr/lib/samba/upcase.dat
-	#/usr/lib/samba/valid.dat
-
-	cd source
-	./configure \
-		--prefix=/usr \
-		--sysconfdir=/etc/samba \
-		--localstatedir=/var \
-		--libdir=/usr/lib/samba \
-		--with-privatedir=/etc/samba/private \
-		--with-lockdir=/var/cache/samba \
-		--with-piddir=/var/run/samba \
-		--with-swatdir=/usr/share/swat \
-		--with-configdir=/etc/samba \
-		--with-logfilebase=/var/log/samba \
-		\
-		--enable-static --enable-shared \
-		--with-manpages-langs=en \
-		--without-spinlocks \
-		--with-libsmbclient \
-		--with-automount \
-		--with-smbmount \
-		--with-winbind \
-		--with-quotas \
-		--with-syslog \
-		--with-idmap \
-		--host=${CHOST} ${myconf} || die
-
-	# Compile main SAMBA pieces.
-	make everything || die "SAMBA pieces"
-	#make rpctorture
-
-	# Build selected samba-vscan plugins.
-	if use oav; then
-		cd ${S}/examples.bin/VFS/${PN}-vscan-${VSCAN_VER}
-		./configure || die "bad ${PN}-vscan-${VSCAN_VER} ./configure"
-		for i in ${VSCAN_MODS}
-		do
-			cd ${S}/examples.bin/VFS/${PN}-vscan-${VSCAN_VER}/$i
-			make USE_INCLMKSDLIB=1 #needed for the mks build
-			assert "problem building $i vscan module"
-		done
-	fi
-
-	# Build mkntpasswd from the smbldap-tools.
-	if use ldap; then
-		cd ${WORKDIR}/smbldap-tools-${SMBLDAP_TOOLS_VER}
-		tar --no-same-owner -zxf mkntpwd.tar.gz || die "mkntpwd unpack"
-		cd mkntpwd
-		VISUAL="" make || die "mkntpwd compile problem"
-	fi
-}
-
-src_install() {
-# For testing brokeness of make install
-#	cd source
-#	make DESTDIR=${D} install installmodules install_python
-#	assert "It would be nice if that just worked."
-
-	# Install standard binary files.
-	for i in smbclient net smbspool testparm testprns smbstatus \
-		smbcontrol smbtree tdbbackup nmblookup pdbedit \
-		smbpasswd rpcclient smbcacls profiles ntlm_auth \
-		smbcquotas smbmount smbmnt smbumount wbinfo \
-		debug2html smbfilter talloctort #smbsh editreg
-	do
-		exeinto /usr/bin
-		doexe source/bin/${i}
-	done
-	doexe source/script/{smbtar,findsmb}
-
-	# TORTURE_PROGS / Testing stuff, if they built they will come.
-	for i in smbtorture msgtest masktest locktest locktest2 \
-		nsstest vfstest rpctorture
-	do
-		if [ -x source/bin/${i} ]
-		then
-			exeinto /usr/bin
-			doexe source/bin/${i}
-		fi
-	done
-
-	# Installing these two setuid-root allows users to (un)mount smbfs.
-	fperms 4111 /usr/bin/smbumount
-	fperms 4111 /usr/bin/smbmnt
-
-	# Install server binaries.
-	for i in smbd nmbd swat winbindd # wrepld
-	do
-		exeinto /usr/sbin
-		doexe source/bin/${i}
-	done
-
-	# Libraries.
-	exeinto /usr/lib
-	#broken for a while now with some wacky glibc issue
-	#doexe source/bin/smbwrapper.so
-	doexe source/bin/libsmbclient.so
-	insinto /usr/lib
-	doins source/bin/libsmbclient.a
-	insinto /usr/include
-	doins source/include/libsmbclient.h
-	exeinto /lib/security
-	doexe source/nsswitch/pam_winbind.so
-	use pam && doexe source/bin/pam_smbpass.so
-
-	# Nsswitch extensions.
-	for i in wins winbind
-	do
-		exeinto /lib
-		doexe source/nsswitch/libnss_${i}.so
-	done
-	# make link for wins and winbind resolvers..
-	( cd ${D}/lib ; ln -s libnss_wins.so libnss_wins.so.2 )
-	( cd ${D}/lib ; ln -s libnss_winbind.so libnss_winbind.so.2 )
-
-	# Python extensions.
-	if use python; then
-		cd source
-		python python/setup.py install --root=${D} || die
-		cd ..
-	fi
-
-	# VFS plugin modules.
-	exeinto /usr/lib/samba/vfs
-	use oav && doexe examples.bin/VFS/${PN}-vscan-${VSCAN_VER}/*/vscan-*.so
-	for i in audit cap default_quota extd_audit fake_perms \
-		netatalk readonly recycle
-	do
-		if [ -x source/bin/${i}.so ]
-		then
-			doexe source/bin/${i}.so
-		fi
-	done
-
-	# Passdb modules.
-	exeinto /usr/lib/samba/pdb
-	use mysql && doexe source/bin/mysql.so
-	use xml && doexe source/bin/xml.so
-
-	# Install codepage data files.
-	insinto /usr/lib/samba
-	doins source/codepages/*.dat
-
-	# Install SWAT helper files.
-	for i in swat/help/*.html docs/htmldocs/*.html
-	do
-		insinto /usr/share/swat/help
-		doins ${i}
-	done
-	for i in swat/images/*.gif
-	do
-		insinto /usr/share/swat/images
-		doins ${i}
-	done
-	for i in swat/include/*.html
-	do
-		insinto /usr/share/swat/include
-		doins ${i}
-	done
-
-	# Install IDEALX scripts for LDAP backend administration.
-	if use ldap; then
-		cd ${WORKDIR}/smbldap-tools-${SMBLDAP_TOOLS_VER}
-		exeinto /usr/share/samba/scripts ; doexe smbldap-*.pl
-		exeinto /usr/sbin ; doexe mkntpwd/mkntpwd
-		insinto /etc/samba ; doins smbldap_conf.pm
-		exeinto /etc/samba ; doexe smbldap_tools.pm
-		eval `perl '-V:installarchlib'`
-		dodir ${installarchlib}
-		dosym /etc/samba/smbldap_conf.pm ${installarchlib}
-		dosym /etc/samba/smbldap_conf.pm /usr/share/samba/scripts
-		dosym /etc/samba/smbldap_tools.pm ${installarchlib}
-		dosym /etc/samba/smbldap_tools.pm /usr/share/samba/scripts
-		cd ${S}
-	fi
-
-	# Install man pages.
-	doman docs/manpages/*
-
-	# SAMBA has a lot of docs, so this just basically
-	# installs them all!  We don't want two copies of
-	# the book or manpages though, so:
-	rm -rf docs/htmldocs/using_samba docs/manpages
-	#
-	dodoc COPYING Manifest README Roadmap WHATSNEW.txt
-	docinto full_docs
-	cp -a docs/* ${D}/usr/share/doc/${PF}/full_docs
-	docinto examples
-	dodoc ${FILESDIR}/nsswitch.conf-{wins,winbind}
-	cp -a examples/* ${D}/usr/share/doc/${PF}/examples
-	prepalldocs
-	# and we should unzip the html docs..
-	gunzip ${D}/usr/share/doc/${PF}/full_docs/faq/*
-	gunzip ${D}/usr/share/doc/${PF}/full_docs/htmldocs/*
-	if use oav; then
-		docinto ${PN}-vscan-${VSCAN_VER}
-		cd ${WORKDIR}/${PN}-vscan-${VSCAN_VER}
-		dodoc AUTHORS COPYING ChangeLog FAQ INSTALL NEWS README TODO
-		dodoc */*.conf
-		cd ${S}
-	fi
-	if use ldap; then
-		docinto smbldap-tools-${SMBLDAP_TOOLS_VER}
-		cd ${WORKDIR}/smbldap-tools-${SMBLDAP_TOOLS_VER}
-		dodoc CONTRIBUTORS COPYING ChangeLog FILES INFRA INSTALL README TODO
-		cd ${S}
-	fi
-	chown -R root:root ${D}/usr/share/doc/${PF}
-
-	# link /usr/bin/smbmount to /sbin/mount.smbfs which allows it
-	# to work transparently with the standard 'mount' command..
-	dodir /sbin
-	dosym /usr/bin/smbmount /sbin/mount.smbfs
-
-	# make the smb backend symlink for cups printing support..
-	if use cups; then
-		dodir /usr/lib/cups/backend
-		dosym /usr/bin/smbspool /usr/lib/cups/backend/smb
-	fi
-
-	# Now the config files.
-	insinto /etc
-	insinto /etc/samba
-	doins ${FILESDIR}/smbusers
-	newins ${FILESDIR}/smb.conf.example-samba3 smb.conf.example
-	doins ${FILESDIR}/lmhosts
-	doins ${FILESDIR}/recycle.conf
-
-	insinto /etc/pam.d
-	newins ${FILESDIR}/samba.pam samba
-	doins ${FILESDIR}/system-auth-winbind
-
-	exeinto /etc/init.d
-	newexe ${FILESDIR}/samba-init samba
-	newexe ${FILESDIR}/winbind-init winbind
-
-	insinto /etc/xinetd.d
-	newins ${FILESDIR}/swat.xinetd swat
-
-	if use ldap; then
-		insinto /etc/openldap/schema
-		doins examples/LDAP/samba.schema
-	fi
-}
-
-pkg_postinst() {
-	# touch /etc/samba/smb.conf so that people installing samba just
-	# to mount smb shares don't get annoying warnings all the time..
-	if [ ! -e ${ROOT}/etc/samba/smb.conf ] ; then
-		touch ${ROOT}/etc/samba/smb.conf
-	fi
-
-	# empty dirs..
-	install -m0700 -o root -g root -d ${ROOT}/etc/samba/private
-	install -m1777 -o root -g root -d ${ROOT}/var/spool/samba
-	install -m0755 -o root -g root -d ${ROOT}/var/log/samba
-	install -m0755 -o root -g root -d ${ROOT}/var/run/samba
-	install -m0755 -o root -g root -d ${ROOT}/var/cache/samba
-	install -m0755 -o root -g root -d ${ROOT}/var/lib/samba/{netlogon,profiles}
-	install -m0755 -o root -g root -d \
-		${ROOT}/var/lib/samba/printers/{W32X86,WIN40,W32ALPHA,W32MIPS,W32PPC}
-}
diff --git a/net-fs/samba/samba-3.0.1.ebuild b/net-fs/samba/samba-3.0.1.ebuild
deleted file mode 100644
index b6a2706b94fe..000000000000
--- a/net-fs/samba/samba-3.0.1.ebuild
+++ /dev/null
@@ -1,416 +0,0 @@
-# Copyright 1999-2004 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-fs/samba/samba-3.0.1.ebuild,v 1.4 2004/03/23 15:11:15 avenj Exp $
-
-inherit eutils
-
-IUSE="kerberos mysql xml acl cups ldap pam readline python"
-IUSE="${IUSE} oav"
-
-DESCRIPTION="SAMBA is a suite of SMB and CIFS client/server programs for UNIX"
-HOMEPAGE="http://www.samba.org/
-	http://www.openantivirus.org/projects.php"
-
-SMBLDAP_TOOLS_VER=0.8.2
-VSCAN_VER=0.3.4
-VSCAN_MODS=${VSCAN_MODS:=fprot mks openantivirus sophos trend icap clamav} #kapersky
-# To build the "kapersky" plugin, the kapersky lib must be installed.
-
-_CVS="-${PV/_/}"
-S=${WORKDIR}/${PN}${_CVS}
-
-SRC_URI="mirror://samba/${PN}${_CVS}.tar.bz2
-	oav? mirror://sourceforge/openantivirus/${PN}-vscan-${VSCAN_VER}.tar.bz2
-	ldap? http://samba.idealx.org/dist/smbldap-tools-${SMBLDAP_TOOLS_VER}.tgz"
-
-_COMMON_DEPS="dev-libs/popt
-	readline? sys-libs/readline
-	kerberos? ( app-crypt/mit-krb5 )
-	mysql? ( dev-db/mysql sys-libs/zlib )
-	acl? sys-apps/acl
-	cups? net-print/cups
-	ldap? net-nds/openldap
-	pam? sys-libs/pam
-	python? dev-lang/python"
-DEPEND="sys-devel/autoconf ${_COMMON_DEPS}"
-#IDEALX scripts are now using Net::LDAP
-RDEPEND="ldap? dev-perl/perl-ldap ${_COMMON_DEPS}"
-
-#KEYWORDS="~x86 ~ppc ~sparc ~mips ~hppa ~amd64 ~ppc64"
-# THIS NEEDS TO DEPEND ON A linux-headers > 2.4.21, BUT ALL
-# THOSE ARE MARKED -*  IT DOES NOT COMPILE
-#   - Brad House <brad_mssw@gentoo.org> 12/23/2003
-KEYWORDS="-*"
-LICENSE="GPL-2"
-SLOT="0"
-
-src_unpack() {
-	local i
-	unpack ${A} || die
-	cd ${S} || die
-
-	# Clean up CVS
-	find . -name .cvsignore | xargs rm -f
-	find . -name CVS | xargs rm -rf
-
-	# Add patch(es)
-	#Next one is from eger@cc.gatech.edu :)
-	patch -p1 <${FILESDIR}/samba-3.0.0-python-setup.patch || die
-	#Fix for bug #27858
-	if [ "${ARCH}" = "sparc" ]
-	then
-		cd ${S}/source/include
-		epatch ${FILESDIR}/samba-2.2.8-statfs.patch
-	fi
-
-	# For clean docs packaging sake.
-	rm -rf ${S}/examples.bin
-	cp -a ${S}/examples ${S}/examples.bin
-
-	# Prep samba-vscan source.
-	if use oav
-	then
-		cp -a ${WORKDIR}/${PN}-vscan-${VSCAN_VER} \
-			${S}/examples.bin/VFS
-	fi
-
-	cd ${S}/source
-	echo "Running autoconf ..."
-	autoconf || die
-}
-
-src_compile() {
-	local i
-	local myconf
-	local mymods
-
-	#this is deprecated...
-	#mymods="nisplussam"
-	use xml && mymods="xml,${mymods}"
-	use mysql && mymods="mysql,${mymods}"
-
-	myconf="--with-expsam=${mymods}"
-
-	use acl \
-		&& myconf="${myconf} --with-acl-support" \
-		|| myconf="${myconf} --without-acl-support"
-
-	use pam \
-		&& myconf="${myconf} --with-pam --with-pam_smbpass" \
-		|| myconf="${myconf} --without-pam --without-pam_smbpass"
-
-	use cups \
-		&& myconf="${myconf} --enable-cups" \
-		|| myconf="${myconf} --disable-cups"
-
-	use ldap \
-		&& myconf="${myconf} --with-ldap" \
-		|| myconf="${myconf} --without-ldap"
-		#this is for old samba 2.x compat
-		#myconf="${myconf} --with-ldapsam" 
-		myconf="${myconf} --without-ldapsam"
-
-	if [ "${ARCH}" != "amd64" ]
-	then
-		use kerberos \
-			&& myconf="${myconf} --with-ads" \
-			|| myconf="${myconf} --without-ads"
-	else
-		myconf="${myconf} --without-ads"
-	fi
-
-	use python \
-		&& myconf="${myconf} --with-python=yes" \
-		|| myconf="${myconf} --with-python=no"
-
-	use readline \
-		&& myconf="${myconf} --with-readline" \
-		|| myconf="${myconf} --without-readline"
-
-	einfo "\$myconf is: $myconf"
-
-	#default_{static,shared}_modules|source/configure
-	#/usr/lib/samba/auth/.............      AUTH_MODULES
-	#/usr/lib/samba/charset/                CHARSET_MODULES
-	#/usr/lib/samba/pdb/..............      PDB_MODULES
-	#/usr/lib/samba/rpc/                    RPC_MODULES
-	#/usr/lib/samba/vfs/..............      VFS_MODULES|source/Makefile
-	#/usr/lib/samba/lowcase.dat
-	#/usr/lib/samba/upcase.dat
-	#/usr/lib/samba/valid.dat
-
-	cd source
-	./configure \
-		--prefix=/usr \
-		--sysconfdir=/etc/samba \
-		--localstatedir=/var \
-		--libdir=/usr/lib/samba \
-		--with-privatedir=/etc/samba/private \
-		--with-lockdir=/var/cache/samba \
-		--with-piddir=/var/run/samba \
-		--with-swatdir=/usr/share/swat \
-		--with-configdir=/etc/samba \
-		--with-logfilebase=/var/log/samba \
-		\
-		--enable-static --enable-shared \
-		--with-manpages-langs=en \
-		--without-spinlocks \
-		--with-libsmbclient \
-		--with-automount \
-		--with-smbmount \
-		--with-winbind \
-		--with-quotas \
-		--with-syslog \
-		--with-idmap \
-		--host=${CHOST} ${myconf} || die
-
-	# Compile main SAMBA pieces.
-	make everything || die "SAMBA pieces"
-	make rpctorture || ewarn "rpctorture didnt build"
-
-	# Build selected samba-vscan plugins.
-	if use oav
-	then
-		cd ${S}/examples.bin/VFS/${PN}-vscan-${VSCAN_VER}
-		./configure
-		assert "bad ${PN}-vscan-${VSCAN_VER} ./configure"
-
-		for i in ${VSCAN_MODS}
-		do
-			cd ${S}/examples.bin/VFS/${PN}-vscan-${VSCAN_VER}/$i
-			make USE_INCLMKSDLIB=1 #needed for the mks build
-			assert "problem building $i vscan module"
-		done
-	fi
-
-	# Build mkntpasswd from the smbldap-tools.
-	if use ldap
-	then
-		cd ${WORKDIR}/smbldap-tools-${SMBLDAP_TOOLS_VER}
-		tar --no-same-owner -zxf mkntpwd.tar.gz
-		cd mkntpwd
-		VISUAL="" make || die "mkntpwd compile problem"
-	fi
-
-	# Build mount.cifs
-	cd ${S}/source
-	gcc ${CFLAGS} client/mount.cifs.c -o bin/mount.cifs
-	assert "mount.cifs compile problem"
-}
-
-src_install() {
-# For testing brokeness of make install
-#	cd source
-#	make DESTDIR=${D} install installmodules install_python
-#	assert "It would be nice if that just worked."
-
-	# Install standard binary files.
-	for i in smbclient net smbspool testparm testprns smbstatus \
-		smbcontrol smbtree tdbbackup nmblookup pdbedit \
-		smbpasswd rpcclient smbcacls profiles ntlm_auth \
-		smbcquotas smbmount smbmnt smbumount wbinfo \
-		debug2html smbfilter talloctort mount.cifs #smbsh editreg
-	do
-		exeinto /usr/bin
-		doexe source/bin/${i}
-	done
-	doexe source/script/{smbtar,findsmb}
-
-	# TORTURE_PROGS / Testing stuff, if they built they will come.
-	for i in smbtorture msgtest masktest locktest locktest2 \
-		nsstest vfstest rpctorture
-	do
-		if [ -x source/bin/${i} ]
-		then
-			exeinto /usr/bin
-			doexe source/bin/${i}
-		fi
-	done
-
-	# Installing these setuid-root allows users to (un)mount smbfs/cifs.
-	fperms 4111 /usr/bin/smbumount
-	fperms 4111 /usr/bin/smbmnt
-	fperms 4111 /usr/bin/mount.cifs
-
-	# Install server binaries.
-	for i in smbd nmbd swat winbindd # wrepld
-	do
-		exeinto /usr/sbin
-		doexe source/bin/${i}
-	done
-
-	# Libraries.
-	exeinto /usr/lib
-	#broken for a while now with some wacky glibc issue
-	#doexe source/bin/smbwrapper.so
-	doexe source/bin/libsmbclient.so
-	insinto /usr/lib
-	doins source/bin/libsmbclient.a
-	insinto /usr/include
-	doins source/include/libsmbclient.h
-	exeinto /lib/security
-	doexe source/nsswitch/pam_winbind.so
-	use pam && doexe source/bin/pam_smbpass.so
-
-	# Nsswitch extensions.
-	for i in wins winbind
-	do
-		exeinto /lib
-		doexe source/nsswitch/libnss_${i}.so
-	done
-	# make link for wins and winbind resolvers..
-	( cd ${D}/lib ; ln -s libnss_wins.so libnss_wins.so.2 )
-	( cd ${D}/lib ; ln -s libnss_winbind.so libnss_winbind.so.2 )
-
-	# Python extensions.
-	if use python
-	then
-		cd source
-		python python/setup.py install --root=${D} || die
-		cd ..
-	fi
-
-	# VFS plugin modules.
-	exeinto /usr/lib/samba/vfs
-	if use oav
-	then
-		doexe examples.bin/VFS/${PN}-vscan-${VSCAN_VER}/*/vscan-*.so
-	fi
-	for i in audit cap default_quota extd_audit fake_perms \
-		netatalk readonly recycle
-	do
-		if [ -x source/bin/${i}.so ]
-		then
-			doexe source/bin/${i}.so
-		fi
-	done
-
-	# Passdb modules.
-	exeinto /usr/lib/samba/pdb
-	use mysql && doexe source/bin/mysql.so
-	use xml && doexe source/bin/xml.so
-
-	# Install codepage data files.
-	insinto /usr/lib/samba
-	doins source/codepages/*.dat
-
-	# Install SWAT helper files.
-	for i in swat/help/*.html docs/htmldocs/*.html
-	do
-		insinto /usr/share/swat/help
-		doins ${i}
-	done
-	for i in swat/images/*.gif
-	do
-		insinto /usr/share/swat/images
-		doins ${i}
-	done
-	for i in swat/include/*.html
-	do
-		insinto /usr/share/swat/include
-		doins ${i}
-	done
-
-	# Install IDEALX scripts for LDAP backend administration.
-	if use ldap; then
-		cd ${WORKDIR}/smbldap-tools-${SMBLDAP_TOOLS_VER}
-		exeinto /usr/share/samba/scripts ; doexe smbldap-*.pl
-		exeinto /usr/sbin ; doexe mkntpwd/mkntpwd
-		insinto /etc/samba ; doins smbldap_conf.pm
-		exeinto /etc/samba ; doexe smbldap_tools.pm
-		eval `perl '-V:installarchlib'`
-		dodir ${installarchlib}
-		dosym /etc/samba/smbldap_conf.pm ${installarchlib}
-		dosym /etc/samba/smbldap_conf.pm /usr/share/samba/scripts
-		dosym /etc/samba/smbldap_tools.pm ${installarchlib}
-		dosym /etc/samba/smbldap_tools.pm /usr/share/samba/scripts
-		cd ${S}
-	fi
-
-	# Install man pages.
-	doman docs/manpages/*
-
-	# SAMBA has a lot of docs, so this just basically
-	# installs them all!  We don't want two copies of
-	# the book or manpages though, so:
-	rm -rf docs/htmldocs/using_samba docs/manpages
-	#
-	dodoc COPYING Manifest README Roadmap WHATSNEW.txt
-	docinto full_docs
-	cp -a docs/* ${D}/usr/share/doc/${PF}/full_docs
-	docinto examples
-	dodoc ${FILESDIR}/nsswitch.conf-{wins,winbind}
-	cp -a examples/* ${D}/usr/share/doc/${PF}/examples
-	prepalldocs
-	# and we should unzip the html docs..
-	gunzip ${D}/usr/share/doc/${PF}/full_docs/faq/*
-	gunzip ${D}/usr/share/doc/${PF}/full_docs/htmldocs/*
-	if use oav; then
-		docinto ${PN}-vscan-${VSCAN_VER}
-		cd ${WORKDIR}/${PN}-vscan-${VSCAN_VER}
-		dodoc AUTHORS COPYING ChangeLog FAQ INSTALL NEWS README TODO
-		dodoc */*.conf
-		cd ${S}
-	fi
-	if use ldap; then
-		docinto smbldap-tools-${SMBLDAP_TOOLS_VER}
-		cd ${WORKDIR}/smbldap-tools-${SMBLDAP_TOOLS_VER}
-		dodoc CONTRIBUTORS COPYING ChangeLog FILES INFRA INSTALL README TODO
-		cd ${S}
-	fi
-	chown -R root:root ${D}/usr/share/doc/${PF}
-
-	# link /usr/bin/smbmount to /sbin/mount.smbfs which allows it
-	# to work transparently with the standard 'mount' command..
-	dodir /sbin
-	dosym /usr/bin/smbmount /sbin/mount.smbfs
-
-	# make the smb backend symlink for cups printing support..
-	if use cups; then
-		dodir /usr/lib/cups/backend
-		dosym /usr/bin/smbspool /usr/lib/cups/backend/smb
-	fi
-
-	# Now the config files.
-	insinto /etc
-	insinto /etc/samba
-	doins ${FILESDIR}/smbusers
-	newins ${FILESDIR}/smb.conf.example-samba3 smb.conf.example
-	doins ${FILESDIR}/lmhosts
-	doins ${FILESDIR}/recycle.conf
-
-	insinto /etc/pam.d
-	newins ${FILESDIR}/samba.pam samba
-	doins ${FILESDIR}/system-auth-winbind
-
-	exeinto /etc/init.d
-	newexe ${FILESDIR}/samba-init samba
-	newexe ${FILESDIR}/winbind-init winbind
-
-	insinto /etc/xinetd.d
-	newins ${FILESDIR}/swat.xinetd swat
-
-	if use ldap; then
-		insinto /etc/openldap/schema
-		doins examples/LDAP/samba.schema
-	fi
-}
-
-pkg_postinst() {
-	# touch /etc/samba/smb.conf so that people installing samba just
-	# to mount smb shares don't get annoying warnings all the time..
-	if [ ! -e ${ROOT}/etc/samba/smb.conf ] ; then
-		touch ${ROOT}/etc/samba/smb.conf
-	fi
-
-	# empty dirs..
-	install -m0700 -o root -g root -d ${ROOT}/etc/samba/private
-	install -m1777 -o root -g root -d ${ROOT}/var/spool/samba
-	install -m0755 -o root -g root -d ${ROOT}/var/log/samba
-	install -m0755 -o root -g root -d ${ROOT}/var/log/samba3
-	install -m0755 -o root -g root -d ${ROOT}/var/run/samba
-	install -m0755 -o root -g root -d ${ROOT}/var/cache/samba
-	install -m0755 -o root -g root -d ${ROOT}/var/lib/samba/{netlogon,profiles}
-	install -m0755 -o root -g root -d \
-		${ROOT}/var/lib/samba/printers/{W32X86,WIN40,W32ALPHA,W32MIPS,W32PPC}
-}
diff --git a/net-fs/samba/samba-3.0.2a-r1.ebuild b/net-fs/samba/samba-3.0.2a-r1.ebuild
deleted file mode 100644
index 1e8fb5013fdd..000000000000
--- a/net-fs/samba/samba-3.0.2a-r1.ebuild
+++ /dev/null
@@ -1,440 +0,0 @@
-# Copyright 1999-2004 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-fs/samba/samba-3.0.2a-r1.ebuild,v 1.2 2004/04/22 15:05:50 weeve Exp $
-
-inherit eutils
-
-IUSE="kerberos mysql xml acl cups ldap pam readline python"
-IUSE="${IUSE} oav"
-
-DESCRIPTION="SAMBA is a suite of SMB and CIFS client/server programs for UNIX"
-HOMEPAGE="http://www.samba.org/
-	http://www.openantivirus.org/projects.php"
-
-SMBLDAP_TOOLS_VER=0.8.4
-VSCAN_VER=0.3.4
-VSCAN_MODS=${VSCAN_MODS:=fprot mks openantivirus sophos trend icap clamav} #kapersky
-# To build the "kapersky" plugin, the kapersky lib must be installed.
-
-_CVS="-${PV/_/}"
-S=${WORKDIR}/${PN}${_CVS}
-
-SRC_URI="mirror://samba/${PN}${_CVS}.tar.bz2
-	oav? mirror://sourceforge/openantivirus/${PN}-vscan-${VSCAN_VER}.tar.bz2
-	ldap? http://samba.idealx.org/dist/smbldap-tools-${SMBLDAP_TOOLS_VER}.tgz"
-
-_COMMON_DEPS="dev-libs/popt
-	readline? sys-libs/readline
-	ldap? ( kerberos? ( app-crypt/mit-krb5 ) )
-	mysql? ( dev-db/mysql sys-libs/zlib )
-	xml? ( dev-libs/libxml2 sys-libs/zlib )
-	acl? sys-apps/acl
-	cups? net-print/cups
-	ldap? net-nds/openldap
-	pam? sys-libs/pam
-	python? dev-lang/python"
-DEPEND="sys-devel/autoconf
-	>=sys-apps/sed-4
-	${_COMMON_DEPS}"
-#IDEALX scripts are now using Net::LDAP
-RDEPEND="ldap? dev-perl/perl-ldap ${_COMMON_DEPS}"
-
-KEYWORDS="~x86 ~ppc ~sparc mips ~hppa amd64 ~ia64 ~alpha"
-LICENSE="GPL-2"
-SLOT="0"
-
-src_unpack() {
-	local i
-	unpack ${A} || die
-	cd ${S} || die
-
-	# Clean up CVS
-	find . -name .cvsignore | xargs rm -f
-	find . -name CVS | xargs rm -rf
-
-	# Add patch(es)
-	#Next one is from eger@cc.gatech.edu :)
-	patch -p1 <${FILESDIR}/samba-3.0.0-python-setup.patch || die
-	#Fix for bug #27858
-	if [ "${ARCH}" = "sparc" -o "${ARCH}" = "ppc" ]
-	then
-		cd ${S}/source/include
-		epatch ${FILESDIR}/samba-2.2.8-statfs.patch
-	fi
-	# bug 45965; smbprint tmpfile vulnerability
-	# NOTE that this should be removed for Samba 3.0.3, as it will be included
-	# in that release.
-	# Additional Note: Make sure w're in ${S} before patching.
-	cd ${S}
-	epatch ${FILESDIR}/samba-3.0.2a-smbprint.patch
-
-	#Bug #36200; sys-kernel/linux-headers dependent
-	sed -i -e 's:#define LINUX_QUOTAS_2:#define LINUX_QUOTAS_1:' \
-		-e 's:<linux/quota.h>:<sys/quota.h>:' \
-		${S}/source/smbd/quotas.c
-
-	# For clean docs packaging sake.
-	rm -rf ${S}/examples.bin
-	cp -a ${S}/examples ${S}/examples.bin
-
-	# Prep samba-vscan source.
-	if use oav
-	then
-		cp -a ${WORKDIR}/${PN}-vscan-${VSCAN_VER} \
-			${S}/examples.bin/VFS
-	fi
-
-	cd ${S}/source
-	echo "Running autoconf ..."
-	autoconf || die
-}
-
-src_compile() {
-	local i
-	local myconf
-	local mymods
-
-	#this is deprecated...
-	#mymods="nisplussam"
-	use xml && mymods="xml,${mymods}"
-	use mysql && mymods="mysql,${mymods}"
-
-	myconf="--with-expsam=${mymods}"
-
-	use acl \
-		&& myconf="${myconf} --with-acl-support" \
-		|| myconf="${myconf} --without-acl-support"
-
-	use pam \
-		&& myconf="${myconf} --with-pam --with-pam_smbpass" \
-		|| myconf="${myconf} --without-pam --without-pam_smbpass"
-
-	use cups \
-		&& myconf="${myconf} --enable-cups" \
-		|| myconf="${myconf} --disable-cups"
-
-	use ldap \
-		&& myconf="${myconf} --with-ldap" \
-		|| myconf="${myconf} --without-ldap"
-		#this is for old samba 2.x compat
-		#myconf="${myconf} --with-ldapsam" 
-		myconf="${myconf} --without-ldapsam"
-
-	if [ "${ARCH}" != "amd64" ]
-	then
-		use kerberos && use ldap \
-			&& myconf="${myconf} --with-ads" \
-			|| myconf="${myconf} --without-ads"
-	else
-		myconf="${myconf} --without-ads"
-	fi
-
-	use python \
-		&& myconf="${myconf} --with-python=yes" \
-		|| myconf="${myconf} --with-python=no"
-
-	use readline \
-		&& myconf="${myconf} --with-readline" \
-		|| myconf="${myconf} --without-readline"
-
-	einfo "\$myconf is: $myconf"
-
-	#default_{static,shared}_modules|source/configure
-	#/usr/lib/samba/auth/.............      AUTH_MODULES
-	#/usr/lib/samba/charset/                CHARSET_MODULES
-	#/usr/lib/samba/pdb/..............      PDB_MODULES
-	#/usr/lib/samba/rpc/                    RPC_MODULES
-	#/usr/lib/samba/vfs/..............      VFS_MODULES|source/Makefile
-	#/usr/lib/samba/lowcase.dat
-	#/usr/lib/samba/upcase.dat
-	#/usr/lib/samba/valid.dat
-
-	cd source
-	./configure \
-		--prefix=/usr \
-		--sysconfdir=/etc/samba \
-		--localstatedir=/var \
-		--libdir=/usr/lib/samba \
-		--with-privatedir=/etc/samba/private \
-		--with-lockdir=/var/cache/samba \
-		--with-piddir=/var/run/samba \
-		--with-swatdir=/usr/share/swat \
-		--with-configdir=/etc/samba \
-		--with-logfilebase=/var/log/samba \
-		\
-		--enable-static --enable-shared \
-		--with-manpages-langs=en \
-		--without-spinlocks \
-		--with-libsmbclient \
-		--with-automount \
-		--with-smbmount \
-		--with-winbind \
-		--with-quotas \
-		--with-syslog \
-		--with-idmap \
-		--host=${CHOST} ${myconf} || die
-
-	# Compile main SAMBA pieces.
-	make everything || die "SAMBA pieces"
-	make rpctorture || ewarn "rpctorture didnt build"
-
-	# Build selected samba-vscan plugins.
-	if use oav
-	then
-		cd ${S}/examples.bin/VFS/${PN}-vscan-${VSCAN_VER}
-		./configure
-		assert "bad ${PN}-vscan-${VSCAN_VER} ./configure"
-
-		for i in ${VSCAN_MODS}
-		do
-			cd ${S}/examples.bin/VFS/${PN}-vscan-${VSCAN_VER}/$i
-			make USE_INCLMKSDLIB=1 #needed for the mks build
-			assert "problem building $i vscan module"
-		done
-	fi
-
-	# Build mkntpasswd from the smbldap-tools.
-	if use ldap
-	then
-		cd ${WORKDIR}/smbldap-tools-${SMBLDAP_TOOLS_VER}
-		tar --no-same-owner -zxf mkntpwd.tar.gz
-		cd mkntpwd
-		VISUAL="" make || die "mkntpwd compile problem"
-	fi
-
-	# Build mount.cifs
-	cd ${S}/source
-	gcc ${CFLAGS} client/mount.cifs.c -o bin/mount.cifs
-	assert "mount.cifs compile problem"
-}
-
-src_install() {
-# For testing brokeness of make install
-#	cd source
-#	make DESTDIR=${D} install installmodules install_python
-#	assert "It would be nice if that just worked."
-
-	# Install standard binary files.
-	for i in smbclient net smbspool testparm testprns smbstatus \
-		smbcontrol smbtree tdbbackup nmblookup pdbedit \
-		smbpasswd rpcclient smbcacls profiles ntlm_auth \
-		smbcquotas smbmount smbmnt smbumount wbinfo \
-		debug2html smbfilter talloctort mount.cifs #smbsh editreg
-	do
-		exeinto /usr/bin
-		doexe source/bin/${i}
-	done
-	doexe source/script/{smbtar,findsmb}
-
-	# TORTURE_PROGS / Testing stuff, if they built they will come.
-	for i in smbtorture msgtest masktest locktest locktest2 \
-		nsstest vfstest rpctorture
-	do
-		if [ -x source/bin/${i} ]
-		then
-			exeinto /usr/bin
-			doexe source/bin/${i}
-		fi
-	done
-
-	# Installing these setuid-root allows users to (un)mount smbfs/cifs.
-	# ... But this is bad.  See bug 41800.
-	fperms 0111 /usr/bin/smbumount
-	fperms 0111 /usr/bin/smbmnt
-	fperms 0111 /usr/bin/mount.cifs
-
-	# Install server binaries.
-	for i in smbd nmbd swat winbindd # wrepld
-	do
-		exeinto /usr/sbin
-		doexe source/bin/${i}
-	done
-
-	# Libraries.
-	exeinto /usr/lib
-	#broken for a while now with some wacky glibc issue
-	#doexe source/bin/smbwrapper.so
-	doexe source/bin/libsmbclient.so
-	insinto /usr/lib
-	doins source/bin/libsmbclient.a
-	insinto /usr/include
-	doins source/include/libsmbclient.h
-	exeinto /lib/security
-	doexe source/nsswitch/pam_winbind.so
-	use pam && doexe source/bin/pam_smbpass.so
-
-	# Nsswitch extensions.
-	for i in wins winbind
-	do
-		exeinto /lib
-		doexe source/nsswitch/libnss_${i}.so
-	done
-	# make link for wins and winbind resolvers..
-	( cd ${D}/lib ; ln -s libnss_wins.so libnss_wins.so.2 )
-	( cd ${D}/lib ; ln -s libnss_winbind.so libnss_winbind.so.2 )
-
-	# Python extensions.
-	if use python
-	then
-		cd source
-		python python/setup.py install --root=${D} || die
-		cd ..
-	fi
-
-	# VFS plugin modules.
-	exeinto /usr/lib/samba/vfs
-	if use oav
-	then
-		doexe examples.bin/VFS/${PN}-vscan-${VSCAN_VER}/*/vscan-*.so
-	fi
-	for i in audit cap default_quota extd_audit fake_perms \
-		netatalk readonly recycle
-	do
-		if [ -x source/bin/${i}.so ]
-		then
-			doexe source/bin/${i}.so
-		fi
-	done
-
-	# Passdb modules.
-	exeinto /usr/lib/samba/pdb
-	use mysql && doexe source/bin/mysql.so
-	use xml && doexe source/bin/xml.so
-
-	# Install codepage data files.
-	insinto /usr/lib/samba
-	doins source/codepages/*.dat
-
-	# Install SWAT helper files.
-	for i in swat/help/*.html docs/htmldocs/*.html
-	do
-		insinto /usr/share/swat/help
-		doins ${i}
-	done
-	for i in swat/images/*.gif
-	do
-		insinto /usr/share/swat/images
-		doins ${i}
-	done
-	for i in swat/include/*.html
-	do
-		insinto /usr/share/swat/include
-		doins ${i}
-	done
-
-	# Install IDEALX scripts for LDAP backend administration.
-	if use ldap; then
-		cd ${WORKDIR}/smbldap-tools-${SMBLDAP_TOOLS_VER}
-		exeinto /usr/share/samba/scripts ; doexe smbldap-*.pl
-		exeinto /usr/sbin ; doexe mkntpwd/mkntpwd
-		insinto /etc/samba ; doins smbldap_conf.pm
-		exeinto /etc/samba ; doexe smbldap_tools.pm
-		eval `perl '-V:installarchlib'`
-		dodir ${installarchlib}
-		dosym /etc/samba/smbldap_conf.pm ${installarchlib}
-		dosym /etc/samba/smbldap_conf.pm /usr/share/samba/scripts
-		dosym /etc/samba/smbldap_tools.pm ${installarchlib}
-		dosym /etc/samba/smbldap_tools.pm /usr/share/samba/scripts
-		cd ${S}
-	fi
-
-	# Install man pages.
-	doman docs/manpages/*
-
-	# SAMBA has a lot of docs, so this just basically
-	# installs them all!  We don't want two copies of
-	# the book or manpages though, so:
-	rm -rf docs/htmldocs/using_samba docs/manpages
-	#
-	dodoc COPYING Manifest README Roadmap WHATSNEW.txt
-	docinto full_docs
-	cp -a docs/* ${D}/usr/share/doc/${PF}/full_docs
-	docinto examples
-	dodoc ${FILESDIR}/nsswitch.conf-{wins,winbind}
-	cp -a examples/* ${D}/usr/share/doc/${PF}/examples
-	prepalldocs
-	# and we should unzip the html docs..
-	gunzip ${D}/usr/share/doc/${PF}/full_docs/faq/*
-	gunzip ${D}/usr/share/doc/${PF}/full_docs/htmldocs/*
-	if use oav; then
-		docinto ${PN}-vscan-${VSCAN_VER}
-		cd ${WORKDIR}/${PN}-vscan-${VSCAN_VER}
-		dodoc AUTHORS COPYING ChangeLog FAQ INSTALL NEWS README TODO
-		dodoc */*.conf
-		cd ${S}
-	fi
-	if use ldap; then
-		docinto smbldap-tools-${SMBLDAP_TOOLS_VER}
-		cd ${WORKDIR}/smbldap-tools-${SMBLDAP_TOOLS_VER}
-		dodoc CONTRIBUTORS COPYING ChangeLog FILES INFRA INSTALL README TODO
-		cd ${S}
-	fi
-	chown -R root:root ${D}/usr/share/doc/${PF}
-
-	# link /usr/bin/smbmount to /sbin/mount.smbfs which allows it
-	# to work transparently with the standard 'mount' command..
-	dodir /sbin
-	dosym /usr/bin/smbmount /sbin/mount.smbfs
-
-	# make the smb backend symlink for cups printing support..
-	if use cups; then
-		dodir /usr/lib/cups/backend
-		dosym /usr/bin/smbspool /usr/lib/cups/backend/smb
-	fi
-
-	# Now the config files.
-	insinto /etc
-	insinto /etc/samba
-	doins ${FILESDIR}/smbusers
-	newins ${FILESDIR}/smb.conf.example-samba3 smb.conf.example
-	doins ${FILESDIR}/lmhosts
-	doins ${FILESDIR}/recycle.conf
-
-	insinto /etc/pam.d
-	newins ${FILESDIR}/samba.pam samba
-	doins ${FILESDIR}/system-auth-winbind
-
-	exeinto /etc/init.d
-	newexe ${FILESDIR}/samba-init samba
-	newexe ${FILESDIR}/winbind-init winbind
-
-	insinto /etc/xinetd.d
-	newins ${FILESDIR}/swat.xinetd swat
-
-	if use ldap; then
-		insinto /etc/openldap/schema
-		doins examples/LDAP/samba.schema
-	fi
-}
-
-pkg_postinst() {
-	# touch /etc/samba/smb.conf so that people installing samba just
-	# to mount smb shares don't get annoying warnings all the time..
-	if [ ! -e ${ROOT}/etc/samba/smb.conf ] ; then
-		touch ${ROOT}/etc/samba/smb.conf
-	fi
-
-	# empty dirs..
-	install -m0700 -o root -g root -d ${ROOT}/etc/samba/private
-	install -m1777 -o root -g root -d ${ROOT}/var/spool/samba
-	install -m0755 -o root -g root -d ${ROOT}/var/log/samba
-	install -m0755 -o root -g root -d ${ROOT}/var/log/samba3
-	install -m0755 -o root -g root -d ${ROOT}/var/run/samba
-	install -m0755 -o root -g root -d ${ROOT}/var/cache/samba
-	install -m0755 -o root -g root -d ${ROOT}/var/lib/samba/{netlogon,profiles}
-	install -m0755 -o root -g root -d \
-		${ROOT}/var/lib/samba/printers/{W32X86,WIN40,W32ALPHA,W32MIPS,W32PPC}
-
-	ewarn ""
-	ewarn "The smbmount, smbmnt and mount.cifs programs are no longer installed"
-	ewarn "setuid root.  This is a workaround for a security vulnerability"
-	ewarn "in the Samba code of 2.6 kernels."
-	ewarn ""
-	ewarn "If normal users need to be able to mount Samba filesystems, you"
-	ewarn "will need to turn setuid back on.  But BE WARNED, you're giving them"
-	ewarn "a chance to gain root."
-	ewarn ""
-	ewarn "More information:"
-	ewarn "http://bugs.gentoo.org/show_bug.cgi?id=41800"
-	ewarn ""
-}