old ebuilds remove: spring cleanings

Package-Manager: portage-2.1_rc1-r2

7 files changed, 4 insertions, 992 deletions

diff --git a/net-fs/samba/Manifest b/net-fs/samba/Manifest
index 7cb89c73a1d7..411d28900154 100644
--- a/net-fs/samba/Manifest
+++ b/net-fs/samba/Manifest
@@ -9,12 +9,10 @@ SHA256 e01f08d8cc91506b1d212b9b59648b96458fe79c6bff483a5b49aef90c3ac3bb files/RE
 DIST samba-3-gentoo-0.3.10.tar.bz2 16783 RMD160 9f73b1f955ca3b5b9dbedfe9854fd788eca62050 SHA256 69748dbe3566eaa0ea27fd0e0dcef20309089cbe40de2e1bce450f3d9dc4e8c2 size 16783
 DIST samba-3-gentoo-0.3.11.tar.bz2 15929 RMD160 2ad449ab8ceddb2d2f940eaebdab7965925038c5 SHA256 8c6de0f26458995b8d095ddc433caac8b183fbc6e5f9cbc240cb762ae3c1f3da size 15929
 DIST samba-3-gentoo-0.3.3.tar.bz2 17675 RMD160 d9193e67c6ee0861de3f7ba16de42cb38922913c SHA256 1e376c070ba597ad8822741b3b55f810a2613dede9cad1ef3b0f28cc3abb1fdf size 17675
-DIST samba-3-gentoo-0.3.4.tar.bz2 17852 RMD160 cc474ea22ce6a5f589b096c0ffd64cbaadc55e06 SHA256 e49d26735d87b488de53272a37fe6b8048d55098b09ea92056d16d6a7b553b47 size 17852
 DIST samba-3.0.14a.tar.gz 15605851 RMD160 69993b25fc5d4d172fc70e26b9e5e4b5b9ab0c0f SHA256 d8721cc71b9c4ac878d3eef02f01bde7aee18bddd4e40bf213fca577edf3fd18 size 15605851
 DIST samba-3.0.20b.tar.gz 17165513 RMD160 c7fe6cf7e3cae6835efd631f9c7d8b97c8253370 SHA256 61d165b7df5cfae1968833caf76d53a9ebfd3849a40098ed26caafcda0a073f6 size 17165513
 DIST samba-3.0.21a.tar.gz 17524018 RMD160 0daede1526cacd631654a82b33af48ffb4789ce4 SHA256 8f4902db38b20601cc3315fe9516a9380b067678c5a6828bd67e5a8bc46b097c size 17524018
 DIST samba-3.0.21b.tar.gz 17539079 RMD160 883f855523e2a079cd7295df6647b3cb9b56c23a SHA256 a5e6982024105276d347b3b521897d6937c727e273814e743ada8eddf972e7d0 size 17539079
-DIST samba-3.0.21c.tar.gz 17542009 RMD160 2ad1451007cbb5165f5ca3ce77d84abbbd0d6b52 SHA256 9181b82fe6c3ea6b7b248cfddef34481ca3c114d70fe0f11fb60175179e86b43 size 17542009
 DIST samba-3.0.22.tar.gz 17542657 RMD160 b41cffc999c524c1650d2dd3fbd063dc79741091 SHA256 781466885804343248afb74dfdd57df0c7165b252ded06a71c0f24827b2a8e2d size 17542657
 DIST samba-vscan-0.3.6.tar.bz2 166733 RMD160 462a9de0789122c0627b0ed4f6e7b6ed3cd883af SHA256 5e552668d8e31d78281a4e93c4ac9b3490e145bc27d4ad0029d175f6c90a755a size 166733
 DIST samba-vscan-0.3.6b.tar.bz2 164471 RMD160 5cd81345b06f44b2febf3f24e62325322b1c6a3b SHA256 14f78b624b047b90ddf4965998e7115d3b3ac97b3229154a302637d8e49adcd4 size 164471
@@ -22,10 +20,6 @@ EBUILD samba-3.0.14a-r2.ebuild 9269 RMD160 c2ffb9a911f45c1f83313c9972938b6028f37
 MD5 61f0df98191ae242f294459ac9eee7e7 samba-3.0.14a-r2.ebuild 9269
 RMD160 c2ffb9a911f45c1f83313c9972938b6028f374a7 samba-3.0.14a-r2.ebuild 9269
 SHA256 5c1b64cee4479cba6f07981995bf562c49ed45d8d8de6fcc76d0ed65227906cd samba-3.0.14a-r2.ebuild 9269
-EBUILD samba-3.0.14a-r3.ebuild 9280 RMD160 4bc9f7e1787db5cd13795d932096ed4a706c4f43 SHA1 041ef65f95a53859f5d67d5b54ff6659010978bb SHA256 cbe9ead876929affb6abb501528cc07a7622fa3eca6d21eb062bb9762867f243 size 9280
-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
 EBUILD samba-3.0.20b.ebuild 8625 RMD160 67ac257cf61ffcaf2fab2a3dbcff0a35840bc673 SHA1 c54646a4196d4b6b26ce2f97ed347baf6da28682 SHA256 7c816bdf1e9d104d9402add068b96930ce06d869bcce69df8cdcd6725db908f2 size 8625
 MD5 56eb4dab3e8e14f80e89d6b85f7dd902 samba-3.0.20b.ebuild 8625
 RMD160 67ac257cf61ffcaf2fab2a3dbcff0a35840bc673 samba-3.0.20b.ebuild 8625
@@ -38,14 +32,6 @@ EBUILD samba-3.0.21b-r1.ebuild 8717 RMD160 d3626b923e3e16cc8581e5d65db6fb52c1303
 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
-EBUILD samba-3.0.21c-r1.ebuild 8718 RMD160 c64f6e0bc5c8442e6bab0df81f56b95f6424877b SHA1 6ffcb00aba4859820550b8bc1b7c2b9aeae01584 SHA256 468255300550c0e661b043bf2774e1c14d91d2016af3340fb1180d8c1be7c8e7 size 8718
-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
-EBUILD samba-3.0.22-r1.ebuild 8752 RMD160 12053b1df7ea18cab46eb05b76410b70a9512a88 SHA1 5e4d02297fcec357e34db421cbc2363e3a7f4c55 SHA256 5a661ac72d9d46085a92faf86a03293d9d1974bbaa72a587504ad731f086c008 size 8752
-MD5 d8986c871b5f231a8582f2708cfde729 samba-3.0.22-r1.ebuild 8752
-RMD160 12053b1df7ea18cab46eb05b76410b70a9512a88 samba-3.0.22-r1.ebuild 8752
-SHA256 5a661ac72d9d46085a92faf86a03293d9d1974bbaa72a587504ad731f086c008 samba-3.0.22-r1.ebuild 8752
 EBUILD samba-3.0.22-r2.ebuild 8761 RMD160 2a4bc86b3d879bb342f338530c29011f4a33a1f2 SHA1 0b2485336ace89a508ae17c28f087ec92ced02bd SHA256 8d256f095ee75369e64932e38fdcd0a4e209e955e8ddd31bd1139a51a92d30c5 size 8761
 MD5 6bc60b39072774c77513eb77bfa59380 samba-3.0.22-r2.ebuild 8761
 RMD160 2a4bc86b3d879bb342f338530c29011f4a33a1f2 samba-3.0.22-r2.ebuild 8761
@@ -54,10 +40,10 @@ EBUILD samba-3.0.22.ebuild 8724 RMD160 7776c1bb38ee3447d627aaf286c41ed71f2a2b96
 MD5 35d2ea945dc397a1d54c65a7e308a93b samba-3.0.22.ebuild 8724
 RMD160 7776c1bb38ee3447d627aaf286c41ed71f2a2b96 samba-3.0.22.ebuild 8724
 SHA256 99b421e9eace4a7c3fcc80c2f2e32a59569920d8dc7f1fdd8197d0643e2b778f samba-3.0.22.ebuild 8724
-MISC ChangeLog 41658 RMD160 f5d35a53fd567c8ed55459c55714cfc91f4506dd SHA1 59ceae1a4e09f1778b4b38260b0338ca6ef55d59 SHA256 28d582957d49021b814e148b5d7bda8fa643964f6fc413edbef8b9cd731bf0cb size 41658
-MD5 ea4c2b125f5a2c1d138d6a34aed74ffe ChangeLog 41658
-RMD160 f5d35a53fd567c8ed55459c55714cfc91f4506dd ChangeLog 41658
-SHA256 28d582957d49021b814e148b5d7bda8fa643964f6fc413edbef8b9cd731bf0cb ChangeLog 41658
+MISC ChangeLog 41817 RMD160 244aa084454e7ed4a0a979075b9c607871cb3511 SHA1 682aef800f89cb847512c54f2bbfd7546bcf9a82 SHA256 5c353c320f9c6f209aa375a03d0c6a465580cac6cd109a3d119da910f1439bc2 size 41817
+MD5 e603b41998c9afb469a0e0e9e16d667e ChangeLog 41817
+RMD160 244aa084454e7ed4a0a979075b9c607871cb3511 ChangeLog 41817
+SHA256 5c353c320f9c6f209aa375a03d0c6a465580cac6cd109a3d119da910f1439bc2 ChangeLog 41817
 MISC metadata.xml 491 RMD160 a168f5ebf64e25d8c80c1c33220b2695ae8f3645 SHA1 0e2b7b349b3494ce9c4a96dbedd970ca07e8394c SHA256 f6534dfe5249b4f1482818d56c36126ae4681eb5b7d24dbf985f6be6f2c58493 size 491
 MD5 41299f246433a1a55c8fccc77ccd709e metadata.xml 491
 RMD160 a168f5ebf64e25d8c80c1c33220b2695ae8f3645 metadata.xml 491
@@ -65,9 +51,6 @@ SHA256 f6534dfe5249b4f1482818d56c36126ae4681eb5b7d24dbf985f6be6f2c58493 metadata
 MD5 d19f8a2c736b1e043b7c386ffa281d90 files/digest-samba-3.0.14a-r2 765
 RMD160 e605f139f73421a6a0f169660ec30bf53685a062 files/digest-samba-3.0.14a-r2 765
 SHA256 4d105b9a6a86941970c0952a1fb6819986ed6d3794ca4beb9ae1ff1b2539b6d7 files/digest-samba-3.0.14a-r2 765
-MD5 7213d73824037868ef0317797fbe21f9 files/digest-samba-3.0.14a-r3 765
-RMD160 0fad716e6c06a77c442c20761554974d24c8c69d files/digest-samba-3.0.14a-r3 765
-SHA256 ed3463e5bdcd255b4756b72adb2457f6c1d24a8d63e84f886636174efae51768 files/digest-samba-3.0.14a-r3 765
 MD5 4614d5c7bfd399022580e2daa9d34690 files/digest-samba-3.0.20b 768
 RMD160 3ead81756f84279c56199f4f19074978e80a569f files/digest-samba-3.0.20b 768
 SHA256 c93d1ae6429b463a958ac7e42648c326b29a102a9095904ebd204b3f292a85f4 files/digest-samba-3.0.20b 768
@@ -77,15 +60,9 @@ SHA256 a9367cbacbeb43e514e20524732d34db8c642cba4a6c1dea19d934c570da2e55 files/di
 MD5 2ef3430b7d51451dd05a8db9af4f1f8a files/digest-samba-3.0.21b-r1 771
 RMD160 099fa5fd11c134423ba3379820f230c6188d4865 files/digest-samba-3.0.21b-r1 771
 SHA256 1e17717d3b99f13786745be5b92e58228eaf0cd877711a61aefb42cf7221cb8f files/digest-samba-3.0.21b-r1 771
-MD5 ada179818b394efad99103cb50348841 files/digest-samba-3.0.21c-r1 771
-RMD160 e84e116a49bf32b3f9a6ac4b3c2514f5d74b5d7e files/digest-samba-3.0.21c-r1 771
-SHA256 3c260d2486a391df61c66597ae781fab9d328a826de23d76e912f70a9e5f557c files/digest-samba-3.0.21c-r1 771
 MD5 0662e36810981d814aca648190442288 files/digest-samba-3.0.22 768
 RMD160 b8b8d0bbda17578b9e8e8537f38169cdde5df87e files/digest-samba-3.0.22 768
 SHA256 b73e444ff1555efdcb74310eda4dc5ea1e3ae9c9764e2438a616a7aae50919de files/digest-samba-3.0.22 768
-MD5 0662e36810981d814aca648190442288 files/digest-samba-3.0.22-r1 768
-RMD160 b8b8d0bbda17578b9e8e8537f38169cdde5df87e files/digest-samba-3.0.22-r1 768
-SHA256 b73e444ff1555efdcb74310eda4dc5ea1e3ae9c9764e2438a616a7aae50919de files/digest-samba-3.0.22-r1 768
 MD5 0662e36810981d814aca648190442288 files/digest-samba-3.0.22-r2 768
 RMD160 b8b8d0bbda17578b9e8e8537f38169cdde5df87e files/digest-samba-3.0.22-r2 768
 SHA256 b73e444ff1555efdcb74310eda4dc5ea1e3ae9c9764e2438a616a7aae50919de files/digest-samba-3.0.22-r2 768
diff --git a/net-fs/samba/files/digest-samba-3.0.14a-r3 b/net-fs/samba/files/digest-samba-3.0.14a-r3
deleted file mode 100644
index 6ea868207a78..000000000000
--- a/net-fs/samba/files/digest-samba-3.0.14a-r3
+++ /dev/null
@@ -1,9 +0,0 @@
-MD5 359eb9077fd138318fd6140c8c60e34d samba-3-gentoo-0.3.4.tar.bz2 17852
-RMD160 cc474ea22ce6a5f589b096c0ffd64cbaadc55e06 samba-3-gentoo-0.3.4.tar.bz2 17852
-SHA256 e49d26735d87b488de53272a37fe6b8048d55098b09ea92056d16d6a7b553b47 samba-3-gentoo-0.3.4.tar.bz2 17852
-MD5 ebee37e66a8b5f6fd328967dc09088e8 samba-3.0.14a.tar.gz 15605851
-RMD160 69993b25fc5d4d172fc70e26b9e5e4b5b9ab0c0f samba-3.0.14a.tar.gz 15605851
-SHA256 d8721cc71b9c4ac878d3eef02f01bde7aee18bddd4e40bf213fca577edf3fd18 samba-3.0.14a.tar.gz 15605851
-MD5 68c9d099d942d85e68d96804b26ac788 samba-vscan-0.3.6.tar.bz2 166733
-RMD160 462a9de0789122c0627b0ed4f6e7b6ed3cd883af samba-vscan-0.3.6.tar.bz2 166733
-SHA256 5e552668d8e31d78281a4e93c4ac9b3490e145bc27d4ad0029d175f6c90a755a samba-vscan-0.3.6.tar.bz2 166733
diff --git a/net-fs/samba/files/digest-samba-3.0.21c-r1 b/net-fs/samba/files/digest-samba-3.0.21c-r1
deleted file mode 100644
index 927aa23e4ebf..000000000000
--- a/net-fs/samba/files/digest-samba-3.0.21c-r1
+++ /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 14f78b624b047b90ddf4965998e7115d3b3ac97b3229154a302637d8e49adcd4 samba-vscan-0.3.6b.tar.bz2 164471
diff --git a/net-fs/samba/files/digest-samba-3.0.22-r1 b/net-fs/samba/files/digest-samba-3.0.22-r1
deleted file mode 100644
index dbd0d422dd55..000000000000
--- a/net-fs/samba/files/digest-samba-3.0.22-r1
+++ /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 5c39505af17cf5caf3d6ed8bab135036 samba-3.0.22.tar.gz 17542657
-RMD160 b41cffc999c524c1650d2dd3fbd063dc79741091 samba-3.0.22.tar.gz 17542657
-SHA256 781466885804343248afb74dfdd57df0c7165b252ded06a71c0f24827b2a8e2d samba-3.0.22.tar.gz 17542657
-MD5 900502ba36b80620229b94e5129bc856 samba-vscan-0.3.6b.tar.bz2 164471
-RMD160 5cd81345b06f44b2febf3f24e62325322b1c6a3b samba-vscan-0.3.6b.tar.bz2 164471
-SHA256 14f78b624b047b90ddf4965998e7115d3b3ac97b3229154a302637d8e49adcd4 samba-vscan-0.3.6b.tar.bz2 164471
diff --git a/net-fs/samba/samba-3.0.14a-r3.ebuild b/net-fs/samba/samba-3.0.14a-r3.ebuild
deleted file mode 100644
index 58fac4cdabaa..000000000000
--- a/net-fs/samba/samba-3.0.14a-r3.ebuild
+++ /dev/null
@@ -1,318 +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.14a-r3.ebuild,v 1.7 2005/11/08 13:16:13 satya Exp $
-
-inherit eutils versionator
-
-IUSE_LINGUAS="ja pl"
-IUSE="acl cups doc examples kerberos ldap mysql pam postgres python quotas
-	readline winbind xml xml2 libclamav oav selinux"
-
-VSCAN_VER=0.3.6
-PATCH_VER=0.3.4
-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 )
-	http://dev.gentoo.org/~seemant/distfiles/${MY_PP}.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?       ( sys-libs/pam )
-	postgres?  ( dev-db/postgresql sys-libs/zlib )
-	python?    ( dev-lang/python )
-	readline?  ( sys-libs/readline )
-	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
-
-src_unpack() {
-	unpack ${A}; cd ${S2}
-
-	rm -rf ${S2}/examples.ORIG
-
-	export EPATCH_SUFFIX="patch"
-	epatch ${PATCHDIR}/general
-	if use oav ; then
-		cp -pPR ${WORKDIR}/${PFVSCAN} ${S2}/examples/VFS
-		epatch ${PATCHDIR}/vscan
-	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} \
-		--enable-static --enable-shared \
-		--with-smbmount --with-automount \
-		--with-libsmbclient \
-		--without-spinlocks \
-		--with-syslog \
-		--with-idmap \
-		--without-ldapsam \
-		$(use_with acl acl-support) \
-		$(use_enable cups) \
-		$(use_with kerberos krb5) \
-		$(use_with ldap) \
-		$(use_with python) \
-		$(use_with readline) \
-		$(use_with winbind) \
-		$(use_with pam) $(use_with pam pam_smbpass) \
-		$(use_with quotas) $(use_with quotas sys-quotas) \
-		${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
-
-	# mount backend
-	dodir /sbin
-	dosym ../usr/bin/smbmount /sbin/mount.smbfs
-	dosym ../usr/bin/mount.cifs /sbin/mount.cifs
-
-	# bug #46389: samba doesn't create symlink anymore
-	# beaviour seems to be changed in 3.0.6, see bug #61046 
-	dosym 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 ${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() {
-	ewarn ""
-	ewarn "If you are upgrading from a Samba version prior to 3.0.2, and you"
-	ewarn "use Samba's password database, you must run the following command:"
-	ewarn ""
-	ewarn "  pdbedit --force-initialized-passwords"
-	ewarn ""
-	ewarn "2004-09: LIBs flags changes for suid bins: LDFLAGS+='-Wl,-z,now'"
-	ewarn "3.0.12: libsmbclient shared library retrocompatibility is not "
-	ewarn "        assured: please rebuild all samba-linked third part packages"
-
-	if use winbind; then
-		ewarn "         3.0.7: param: 'winbind enable local accounts' is now"
-		ewarn "                       disabled by default"
-	fi
-
-	ewarn "2004-11: /etc/samba/private moved to ${PRIVATE_DST}"
-	ewarn "            for better File System Hierarchy adeherence"
-	ewarn ""
-	einfo "If you experience client locks in file transfers _only_, try the parameter"
-	einfo "         use sendfile = no (man smb.conf(5), man sendfile(2))"
-	einfo "There also seem some problems with the smbfs implementation of the recent 2.6.x kernels"
-	einfo "If you experience problems (lockups) with smbfs, try cifs as an alternative"
-	einfo ""
-
-	if use ldap; then
-		ewarn "If you are upgrading from prior to 3.0.2, and you are using LDAP"
-		ewarn "    for Samba authentication, you must check the sambaPwdLastSet"
-		ewarn "    attribute on all accounts, and ensure it is not 0."
-		einfo ""
-		ewarn "2005-03 [3.0.12]: smbldap-tools is now a separate package"
-		ewarn "                      for ease of upgrade"
-	fi
-
-	einfo "There is a good HOWTO about setting up samba3 with cups and clamav at"
-	einfo "http://www.gentoo.org/doc/en/quick-samba-howto.xml"
-}
-
-pkg_postrm(){
-	# If stale docs, and one isn't re-emerging the latest version, removes
-	# (this is really 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-r1.ebuild b/net-fs/samba/samba-3.0.21c-r1.ebuild
deleted file mode 100644
index 11f7b521e5a2..000000000000
--- a/net-fs/samba/samba-3.0.21c-r1.ebuild
+++ /dev/null
@@ -1,309 +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-r1.ebuild,v 1.2 2006/04/01 17:20:30 corsair 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
-
-	cp ${FILESDIR}/035_all_samba-3.0.21-winbind_log.patch ${PATCHDIR}/general
-	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*: sql is being deprecated"
-	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.22-r1.ebuild b/net-fs/samba/samba-3.0.22-r1.ebuild
deleted file mode 100644
index 4c41941c674b..000000000000
--- a/net-fs/samba/samba-3.0.22-r1.ebuild
+++ /dev/null
@@ -1,311 +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.22-r1.ebuild,v 1.2 2006/05/15 09:03:12 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 ~sh ~sparc ~x86 ~x86-fbsd"
-
-RDEPEND="dev-libs/popt
-	virtual/libiconv
-	acl?       ( kernel_linux? ( 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"
-	use hppa && 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 (bug #133133)
-	if use cups; then
-		dodir $(cups-config --serverbin)/backend
-		dosym /usr/bin/smbspool $(cups-config --serverbin)/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*: sql is being deprecated"
-	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}
-}
-