Remove 3.5_rc

Package-Manager: portage-2.2_rc63/cvs/Linux x86_64
author: Patrick Lauer <patrick@gentoo.org> 2010-03-01 16:25:43 +0000
committer: Patrick Lauer <patrick@gentoo.org> 2010-03-01 16:25:43 +0000
commit: 8b0e63d00f8879734c708df7d66b8e9f11d72e53 (patch)
tree: 6006e4a714be276a22fbd32165266bb6fcc31ba5 /net-fs
parent: Bump to monolithic 3.5 (diff)
download: historical-8b0e63d00f8879734c708df7d66b8e9f11d72e53.tar.gz
historical-8b0e63d00f8879734c708df7d66b8e9f11d72e53.tar.bz2
historical-8b0e63d00f8879734c708df7d66b8e9f11d72e53.zip
20 files changed, 16 insertions, 1867 deletions
diff --git a/net-fs/samba-client/Manifest b/net-fs/samba-client/Manifest
index 30f63e4b8245..33182c490fc2 100644
--- a/net-fs/samba-client/Manifest
+++ b/net-fs/samba-client/Manifest
@@ -8,11 +8,7 @@ AUX samba-3.4.2-missing_includes.patch 293 RMD160 e32b75ddc4a35f20173db731681eae
 AUX samba-3.4.2-upgrade-tevent-version.patch 288 RMD160 3eb9bbd781d4a92e844ff36824b75f6345c11a97 SHA1 6eec152408b8c18459a7d9413134bc37a6d52b63 SHA256 9171d875322387e7b4f4905067d9310da8e82e9c17cc7d0f0df7d163cffbf414
 DIST samba-3.3.10.tar.gz 26133606 RMD160 da0da8a23ba5f10051ed4257a02b5701602b60a3 SHA1 c98e67468ad9b63dada656b7ac23a875929a8a72 SHA256 93246d97038b885be2930b6ec814c2680f7adc9b7d675fed68c26aed2951ab2c
 DIST samba-3.4.5.tar.gz 35377777 RMD160 c6b73650722d92b1e2d77e7376529014d8e3f67b SHA1 bbd390954d0ced3ac9472c9f0650069b266f083c SHA256 7e4ead58a7c1c0dd1811d6f1df22c6ecf7a1dabf0e46ea7f20a6da9cd457d1ca
-DIST samba-3.5.0rc2.tar.gz 30734155 RMD160 d7f7dedd56443cb69324ed3ac885b0653b10452e SHA1 3867e3d647e999e4ada6ccc04956a116d5250eba SHA256 7ef990822432cff6d4de30f028b4f9b0f43993895a5f7afde79e96dec987f209
-DIST samba-3.5.0rc3.tar.gz 30753086 RMD160 efcf3722c92dfb4c2b61179324d4b3bc334d8fb6 SHA1 e71cbcb14e46ce1c7586bc1eb64e970b5c5cf263 SHA256 91f67f3c199e1cfd25ceacef727f87816c7b687a5a643b57723310f8b23c2499
 EBUILD samba-client-3.3.10.ebuild 6656 RMD160 dcde287057799d2e5c3aaecdac5e7f2cfb43df82 SHA1 7c5d8e02171c1ccc4efb3646c98afcb324d12301 SHA256 02d820d873a244be5e3ecbf9f657afb520043d5a6c187606e0666da1d770e3c6
 EBUILD samba-client-3.4.5.ebuild 6941 RMD160 6aa15cf26023e74bc5337ec648ab2e9ff1e9d7b0 SHA1 44d871c497a6c642823d0f3bf8326adae1e27285 SHA256 977b44392e31efa0be6dfffa0016d275747decc0d10bbde956c2d797171356fd
-EBUILD samba-client-3.5.0_rc2.ebuild 6775 RMD160 079ab24b1ab64f89606c0ebfeb3b14d23ed2d590 SHA1 9ec72fbcb9fbbea2aedd7bf5fe7b93ad25a5f27a SHA256 7fb65e02083623989e219fe2d633d42fd8666be9456262dfcc004077fea6120d
-EBUILD samba-client-3.5.0_rc3.ebuild 6775 RMD160 a26659b1f1aba977a993f32e2cf9c05922235730 SHA1 d962d55c991656bd6aacec9a2f94ed6116511b5c SHA256 5aadab481477f94388f7175aa49a12455a9b6fd4ce2e2c75ce64ecb27c0b038f
 MISC ChangeLog 4313 RMD160 9a50e4fd6811fe1c3bfed4bc436f7e4c322aefab SHA1 303b1cfd526c51a7f564a2abc73fa085d252cfc1 SHA256 8481a4ccdb35ce9b57c8e2601376c735bcfccfe4ed4cc925b75d3f3875067fd2
 MISC metadata.xml 807 RMD160 282caaf223266a22027c99000c79e953e468777d SHA1 994996a9eb5bb5e43000aa3d0c485a99a6528f2b SHA256 c504284146f1e33b292d70fcaeff887bc752159f3f263d07d912fb141fc5e6fb
diff --git a/net-fs/samba-client/samba-client-3.5.0_rc2.ebuild b/net-fs/samba-client/samba-client-3.5.0_rc2.ebuild
deleted file mode 100644
index bf5dd5be3278..000000000000
--- a/net-fs/samba-client/samba-client-3.5.0_rc2.ebuild
+++ /dev/null
@@ -1,202 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-fs/samba-client/samba-client-3.5.0_rc2.ebuild,v 1.1 2010/01/26 19:03:08 patrick Exp $
-
-EAPI="2"
-
-inherit pam confutils versionator multilib eutils toolchain-funcs autotools
-
-MY_PV=${PV/_/}
-MY_P="samba-${MY_PV}"
-
-DESCRIPTION="Client bits of the samba network filesystem"
-HOMEPAGE="http://www.samba.org/"
-SRC_URI="http://samba.org/samba/ftp/rc/${MY_P}.tar.gz"
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
-IUSE="samba4 ads aio avahi caps cluster cups debug ldap minimal syslog winbind zeroconf"
-
-DEPEND="!<net-fs/samba-3.3
-	!net-fs/mount-cifs
-	ads? ( virtual/krb5 sys-fs/e2fsprogs
-		net-fs/samba-libs[ads] sys-apps/keyutils )
-	!minimal? (
-		dev-libs/popt
-		dev-libs/iniparser
-		virtual/libiconv
-		zeroconf? ( || ( net-dns/avahi[mdnsresponder-compat] net-misc/mDNSResponder ) )
-		caps? ( sys-libs/libcap )
-		cups? ( net-print/cups )
-		debug? ( dev-libs/dmalloc )
-		ldap? ( net-nds/openldap )
-		syslog? ( virtual/logger )
-		sys-libs/tdb
-		sys-libs/talloc
-		~net-fs/samba-libs-${PV}[caps?,cups?,ldap?,syslog?,winbind?,ads?,samba4?,netapi] )"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/${MY_P}"
-
-# TODO:
-# - enable iPrint on Prefix/OSX and Darwin?
-# - selftest-prefix? selftest?
-
-RESTRICT="test"
-
-CONFDIR="${FILESDIR}/$(get_version_component_range 1-2)"
-BINPROGS="bin/smbclient bin/net bin/smbget bin/smbtree bin/nmblookup bin/smbpasswd bin/rpcclient bin/smbcacls bin/smbcquotas bin/ntlm_auth"
-
-pkg_setup() {
-	confutils_use_depend_all samba4 ads
-	confutils_use_depend_all ads ldap
-}
-
-src_prepare() {
-
-	cp "${FILESDIR}/samba-3.4.2-lib.tevent.python.mk" "lib/tevent/python.mk"
-
-	cd "source3"
-	eautoconf -Ilibreplace -Im4 -I../m4 -I../lib/replace -I../source4
-}
-
-src_configure() {
-	cd "source3"
-	local myconf
-
-	# compile franky samba4 hybrid
-	# http://wiki.samba.org/index.php/Franky
-	if use samba4 ; then
-		myconf="${myconf} --enable-merged-build --enable-developer"
-		if has_version app-crypt/heimdal ; then
-			myconf="${myconf} --with-krb5=/usr/"
-		elif has_version app-crypt/mit-krb5 ; then
-			die "MIT Kerberos not supported by samba 4, use heimdal"
-		else
-			die "No supported kerberos provider detected"
-		fi
-	fi
-
-	# Filter out -fPIE
-	[[ ${CHOST} == *-*bsd* ]] && myconf="${myconf} --disable-pie"
-	use hppa && myconf="${myconf} --disable-pie"
-
-	# Upstream refuses to make this configurable
-	export ac_cv_header_sys_capability_h=no
-	if ! use minimal ; then
-		use caps && export ac_cv_header_sys_capability_h=yes
-	fi
-
-	if ! use minimal || use ads; then
-		# Notes:
-		# - FAM is a plugin for the server
-		# - DNS-SD is only used in client/server code
-		# - AFS is a pw-auth-method and only used in client/server code
-		# - AFSACL is a server module
-		# - automount is only needed in conjunction with NIS and we don't have that
-		# anymore
-		# - quota-support is only needed in server-code
-		# - acl-support is only used in server-code
-		# - --without-dce-dfs and --without-nisplus-home can't be passed to configure but are disabled by default
-		# - current DNS/SD support in the client is via the mdnsresponder-compat api in avahi
-		econf ${myconf} \
-			--sysconfdir=/etc/samba \
-			--localstatedir=/var \
-			$(use_enable debug developer) \
-			--enable-largefile \
-			--enable-socket-wrapper \
-			--enable-nss-wrapper \
-			--disable-swat \
-			$(use_enable debug dmalloc) \
-			$(use minimal && echo "--disable-cups" || echo "$(use_enable cups)") \
-			--disable-iprint \
-			--disable-fam \
-			--enable-shared-libs \
-			$(use minimal && echo "--disable-dnssd" || echo "$(use_enable avahi dnssd)") \
-			--disable-avahi \
-			--with-fhs \
-			--with-privatedir=/var/lib/samba/private \
-			--with-rootsbindir=/var/cache/samba \
-			--with-lockdir=/var/cache/samba \
-			--with-swatdir=/usr/share/doc/${PF}/swat \
-			--with-configdir=/etc/samba \
-			--with-logfilebase=/var/log/samba \
-			--with-pammodulesdir=$(getpam_mod_dir) \
-			--without-afs \
-			--without-fake-kaserver \
-			--without-vfs-afsacl \
-			$(use minimal && echo "--without-ldap" || echo "$(use_with ldap)") \
-			$(use minimal && echo "--without-ads" || echo "$(use_with ads)") \
-			$(use minimal && echo "--without-krb5" || echo "$(use_with ads krb5 /usr)") \
-			$(use minimal && echo "--without-dnsupdate" || echo "$(use_with ads dnsupdate)") \
-			--without-automount \
-			--without-cifsmount \
-			--without-cifsupcall \
-			--without-pam \
-			--without-pam_smbpass \
-			$(use minimal && echo "--without-syslog" || echo "$(use_with syslog)") \
-			--without-quotas \
-			--without-sys-quotas \
-			--without-utmp \
-			--without-lib{talloc,tdb,netapi,smbclient,smbsharemodes} \
-			--without-libaddns \
-			$(use minimal && echo "--without-ctdb" || echo "$(use_with cluster ctdb /usr)") \
-			$(use minimal && echo "--without-cluster" || echo "$(use_with cluster cluster-support)") \
-			--without-acl-support \
-			$(use minimal && echo "--without-aio-support" || echo "$(use_with aio aio-support)") \
-			--with-sendfile-support \
-			$(use minimal && echo "--without-winbind" || echo "$(use_with winbind)") \
-			--without-included-popt \
-			--without-included-iniparser
-	fi
-}
-
-src_compile() {
-	mkdir bin
-	$(tc-getCC) ${CFLAGS} ${LDFLAGS} -o bin/mount.cifs client/{mount.cifs,mtab}.c || die "building mount.cifs failed"
-	$(tc-getCC) ${CFLAGS} ${LDFLAGS} -o bin/umount.cifs client/{umount.cifs,mtab}.c || die "building umount.cifs failed"
-
-	if use ads ; then
-		emake bin/cifs.upcall || die "emake cifs.upcall failed"
-	fi
-
-	cd "source3"
-	if ! use minimal ; then
-		emake ${BINPROGS} || die "emake binprogs failed"
-		if use cups ; then
-			emake bin/smbspool || die "emake smbspool failed"
-		fi
-	fi
-}
-
-src_install() {
-	into /
-	dosbin bin/mount.cifs bin/umount.cifs || die "u/mount.cifs not around"
-	doman docs/manpages/{u,}mount.cifs.8 || die "can't create man pages"
-	dohtml docs/htmldocs/manpages/{u,}mount.cifs.8.html || die "dohtml failed"
-
-	into /usr
-	if use ads ; then
-		dosbin bin/cifs.upcall || die "cifs.upcall not around"
-		doman docs/manpages/cifs.upcall.8 || die "doman failed"
-		dohtml docs/htmldocs/manpages/cifs.upcall.8.html || die "doman failed"
-	fi
-
-	if ! use minimal ; then
-		for prog in ${BINPROGS} ; do
-			dobin source3/${prog} || die "not all bins around"
-		done
-
-		for prog in ${BINPROGS} ; do
-			doman docs/manpages/${prog/bin\/}* || die "doman failed"
-			dohtml docs/htmldocs/manpages/${prog/bin\/}*.html || die "dohtml failed"
-		done
-
-		if use cups ; then
-			dobin source3/bin/smbspool || die "smbspool not around"
-			doman docs/manpages/smbspool.8 || die "doman failed"
-			dohtml docs/htmldocs/manpages/smbspool.8.html || die "dohtml failed"
-			dosym /usr/bin/smbspool $(cups-config --serverbin)/backend/smb
-		fi
-	fi
-}
diff --git a/net-fs/samba-client/samba-client-3.5.0_rc3.ebuild b/net-fs/samba-client/samba-client-3.5.0_rc3.ebuild
deleted file mode 100644
index 380013f9ae24..000000000000
--- a/net-fs/samba-client/samba-client-3.5.0_rc3.ebuild
+++ /dev/null
@@ -1,202 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-fs/samba-client/samba-client-3.5.0_rc3.ebuild,v 1.1 2010/02/19 17:19:59 patrick Exp $
-
-EAPI="2"
-
-inherit pam confutils versionator multilib eutils toolchain-funcs autotools
-
-MY_PV=${PV/_/}
-MY_P="samba-${MY_PV}"
-
-DESCRIPTION="Client bits of the samba network filesystem"
-HOMEPAGE="http://www.samba.org/"
-SRC_URI="http://samba.org/samba/ftp/rc/${MY_P}.tar.gz"
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
-IUSE="samba4 ads aio avahi caps cluster cups debug ldap minimal syslog winbind zeroconf"
-
-DEPEND="!<net-fs/samba-3.3
-	!net-fs/mount-cifs
-	ads? ( virtual/krb5 sys-fs/e2fsprogs
-		net-fs/samba-libs[ads] sys-apps/keyutils )
-	!minimal? (
-		dev-libs/popt
-		dev-libs/iniparser
-		virtual/libiconv
-		zeroconf? ( || ( net-dns/avahi[mdnsresponder-compat] net-misc/mDNSResponder ) )
-		caps? ( sys-libs/libcap )
-		cups? ( net-print/cups )
-		debug? ( dev-libs/dmalloc )
-		ldap? ( net-nds/openldap )
-		syslog? ( virtual/logger )
-		sys-libs/tdb
-		sys-libs/talloc
-		~net-fs/samba-libs-${PV}[caps?,cups?,ldap?,syslog?,winbind?,ads?,samba4?,netapi] )"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/${MY_P}"
-
-# TODO:
-# - enable iPrint on Prefix/OSX and Darwin?
-# - selftest-prefix? selftest?
-
-RESTRICT="test"
-
-CONFDIR="${FILESDIR}/$(get_version_component_range 1-2)"
-BINPROGS="bin/smbclient bin/net bin/smbget bin/smbtree bin/nmblookup bin/smbpasswd bin/rpcclient bin/smbcacls bin/smbcquotas bin/ntlm_auth"
-
-pkg_setup() {
-	confutils_use_depend_all samba4 ads
-	confutils_use_depend_all ads ldap
-}
-
-src_prepare() {
-
-	cp "${FILESDIR}/samba-3.4.2-lib.tevent.python.mk" "lib/tevent/python.mk"
-
-	cd "source3"
-	eautoconf -Ilibreplace -Im4 -I../m4 -I../lib/replace -I../source4
-}
-
-src_configure() {
-	cd "source3"
-	local myconf
-
-	# compile franky samba4 hybrid
-	# http://wiki.samba.org/index.php/Franky
-	if use samba4 ; then
-		myconf="${myconf} --enable-merged-build --enable-developer"
-		if has_version app-crypt/heimdal ; then
-			myconf="${myconf} --with-krb5=/usr/"
-		elif has_version app-crypt/mit-krb5 ; then
-			die "MIT Kerberos not supported by samba 4, use heimdal"
-		else
-			die "No supported kerberos provider detected"
-		fi
-	fi
-
-	# Filter out -fPIE
-	[[ ${CHOST} == *-*bsd* ]] && myconf="${myconf} --disable-pie"
-	use hppa && myconf="${myconf} --disable-pie"
-
-	# Upstream refuses to make this configurable
-	export ac_cv_header_sys_capability_h=no
-	if ! use minimal ; then
-		use caps && export ac_cv_header_sys_capability_h=yes
-	fi
-
-	if ! use minimal || use ads; then
-		# Notes:
-		# - FAM is a plugin for the server
-		# - DNS-SD is only used in client/server code
-		# - AFS is a pw-auth-method and only used in client/server code
-		# - AFSACL is a server module
-		# - automount is only needed in conjunction with NIS and we don't have that
-		# anymore
-		# - quota-support is only needed in server-code
-		# - acl-support is only used in server-code
-		# - --without-dce-dfs and --without-nisplus-home can't be passed to configure but are disabled by default
-		# - current DNS/SD support in the client is via the mdnsresponder-compat api in avahi
-		econf ${myconf} \
-			--sysconfdir=/etc/samba \
-			--localstatedir=/var \
-			$(use_enable debug developer) \
-			--enable-largefile \
-			--enable-socket-wrapper \
-			--enable-nss-wrapper \
-			--disable-swat \
-			$(use_enable debug dmalloc) \
-			$(use minimal && echo "--disable-cups" || echo "$(use_enable cups)") \
-			--disable-iprint \
-			--disable-fam \
-			--enable-shared-libs \
-			$(use minimal && echo "--disable-dnssd" || echo "$(use_enable avahi dnssd)") \
-			--disable-avahi \
-			--with-fhs \
-			--with-privatedir=/var/lib/samba/private \
-			--with-rootsbindir=/var/cache/samba \
-			--with-lockdir=/var/cache/samba \
-			--with-swatdir=/usr/share/doc/${PF}/swat \
-			--with-configdir=/etc/samba \
-			--with-logfilebase=/var/log/samba \
-			--with-pammodulesdir=$(getpam_mod_dir) \
-			--without-afs \
-			--without-fake-kaserver \
-			--without-vfs-afsacl \
-			$(use minimal && echo "--without-ldap" || echo "$(use_with ldap)") \
-			$(use minimal && echo "--without-ads" || echo "$(use_with ads)") \
-			$(use minimal && echo "--without-krb5" || echo "$(use_with ads krb5 /usr)") \
-			$(use minimal && echo "--without-dnsupdate" || echo "$(use_with ads dnsupdate)") \
-			--without-automount \
-			--without-cifsmount \
-			--without-cifsupcall \
-			--without-pam \
-			--without-pam_smbpass \
-			$(use minimal && echo "--without-syslog" || echo "$(use_with syslog)") \
-			--without-quotas \
-			--without-sys-quotas \
-			--without-utmp \
-			--without-lib{talloc,tdb,netapi,smbclient,smbsharemodes} \
-			--without-libaddns \
-			$(use minimal && echo "--without-ctdb" || echo "$(use_with cluster ctdb /usr)") \
-			$(use minimal && echo "--without-cluster" || echo "$(use_with cluster cluster-support)") \
-			--without-acl-support \
-			$(use minimal && echo "--without-aio-support" || echo "$(use_with aio aio-support)") \
-			--with-sendfile-support \
-			$(use minimal && echo "--without-winbind" || echo "$(use_with winbind)") \
-			--without-included-popt \
-			--without-included-iniparser
-	fi
-}
-
-src_compile() {
-	mkdir bin
-	$(tc-getCC) ${CFLAGS} ${LDFLAGS} -o bin/mount.cifs client/{mount.cifs,mtab}.c || die "building mount.cifs failed"
-	$(tc-getCC) ${CFLAGS} ${LDFLAGS} -o bin/umount.cifs client/{umount.cifs,mtab}.c || die "building umount.cifs failed"
-
-	if use ads ; then
-		emake bin/cifs.upcall || die "emake cifs.upcall failed"
-	fi
-
-	cd "source3"
-	if ! use minimal ; then
-		emake ${BINPROGS} || die "emake binprogs failed"
-		if use cups ; then
-			emake bin/smbspool || die "emake smbspool failed"
-		fi
-	fi
-}
-
-src_install() {
-	into /
-	dosbin bin/mount.cifs bin/umount.cifs || die "u/mount.cifs not around"
-	doman docs/manpages/{u,}mount.cifs.8 || die "can't create man pages"
-	dohtml docs/htmldocs/manpages/{u,}mount.cifs.8.html || die "dohtml failed"
-
-	into /usr
-	if use ads ; then
-		dosbin bin/cifs.upcall || die "cifs.upcall not around"
-		doman docs/manpages/cifs.upcall.8 || die "doman failed"
-		dohtml docs/htmldocs/manpages/cifs.upcall.8.html || die "doman failed"
-	fi
-
-	if ! use minimal ; then
-		for prog in ${BINPROGS} ; do
-			dobin source3/${prog} || die "not all bins around"
-		done
-
-		for prog in ${BINPROGS} ; do
-			doman docs/manpages/${prog/bin\/}* || die "doman failed"
-			dohtml docs/htmldocs/manpages/${prog/bin\/}*.html || die "dohtml failed"
-		done
-
-		if use cups ; then
-			dobin source3/bin/smbspool || die "smbspool not around"
-			doman docs/manpages/smbspool.8 || die "doman failed"
-			dohtml docs/htmldocs/manpages/smbspool.8.html || die "dohtml failed"
-			dosym /usr/bin/smbspool $(cups-config --serverbin)/backend/smb
-		fi
-	fi
-}
diff --git a/net-fs/samba-libs/ChangeLog b/net-fs/samba-libs/ChangeLog
index 7cfc1effad84..898d0cb137ca 100644
--- a/net-fs/samba-libs/ChangeLog
+++ b/net-fs/samba-libs/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-fs/samba-libs
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-fs/samba-libs/ChangeLog,v 1.32 2010/02/26 20:17:09 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-fs/samba-libs/ChangeLog,v 1.33 2010/03/01 16:23:47 patrick Exp $
+
+  01 Mar 2010; Patrick Lauer <patrick@gentoo.org>
+  -files/3.5/nsswitch.conf-winbind, -samba-libs-3.5.0_rc2.ebuild,
+  -files/3.5/nsswitch.conf-wins, -samba-libs-3.5.0_rc3.ebuild,
+  -files/3.5/samba.pam, -files/3.5/system-auth-winbind.pam:
+  Remove 3.5_rc
 
   26 Feb 2010; Patrick Lauer <patrick@gentoo.org> -samba-libs-3.3.9.ebuild,
   -samba-libs-3.4.4.ebuild:
diff --git a/net-fs/samba-libs/files/3.5/nsswitch.conf-winbind b/net-fs/samba-libs/files/3.5/nsswitch.conf-winbind
deleted file mode 100644
index 2865b0e63d64..000000000000
--- a/net-fs/samba-libs/files/3.5/nsswitch.conf-winbind
+++ /dev/null
@@ -1,17 +0,0 @@
-# $Header: /var/cvsroot/gentoo-x86/net-fs/samba-libs/files/3.5/nsswitch.conf-winbind,v 1.1 2010/01/26 19:03:33 patrick Exp $
-passwd:      files winbind
-group:       files winbind
-
-hosts:       files dns
-networks:    files dns
-
-services:    db files
-protocols:   db files
-rpc:         db files
-ethers:      db files
-netmasks:    files
-netgroup:    files
-bootparams:  files
-
-automount:   files
-aliases:     files
diff --git a/net-fs/samba-libs/files/3.5/nsswitch.conf-wins b/net-fs/samba-libs/files/3.5/nsswitch.conf-wins
deleted file mode 100644
index 673b643e3da1..000000000000
--- a/net-fs/samba-libs/files/3.5/nsswitch.conf-wins
+++ /dev/null
@@ -1,17 +0,0 @@
-# $Header: /var/cvsroot/gentoo-x86/net-fs/samba-libs/files/3.5/nsswitch.conf-wins,v 1.1 2010/01/26 19:03:33 patrick Exp $
-passwd:      files
-group:       files
-
-hosts:       files dns wins
-networks:    files dns
-
-services:    db files
-protocols:   db files
-rpc:         db files
-ethers:      db files
-netmasks:    files
-netgroup:    files
-bootparams:  files
-
-automount:   files
-aliases:     files
diff --git a/net-fs/samba-libs/files/3.5/samba.pam b/net-fs/samba-libs/files/3.5/samba.pam
deleted file mode 100644
index 91beadd478a4..000000000000
--- a/net-fs/samba-libs/files/3.5/samba.pam
+++ /dev/null
@@ -1,8 +0,0 @@
-#%PAM-1.0
-# * pam_smbpass.so authenticates against the smbpasswd file
-# * changed Redhat's 'pam_stack' with 'include' for *BSD compatibility
-#    (Diego "Flameeyes" Petteno'): enable with pam>=0.78 only
-auth       required     pam_smbpass.so nodelay
-account    include      system-auth
-session    include      system-auth
-password   required     pam_smbpass.so nodelay smbconf=/etc/samba/smb.conf
diff --git a/net-fs/samba-libs/files/3.5/system-auth-winbind.pam b/net-fs/samba-libs/files/3.5/system-auth-winbind.pam
deleted file mode 100644
index 499c799cfd64..000000000000
--- a/net-fs/samba-libs/files/3.5/system-auth-winbind.pam
+++ /dev/null
@@ -1,18 +0,0 @@
-#%PAM-1.0
-# $Header: /var/cvsroot/gentoo-x86/net-fs/samba-libs/files/3.5/system-auth-winbind.pam,v 1.1 2010/01/26 19:03:33 patrick Exp $
-
-auth        required      pam_env.so
-auth        sufficient    pam_winbind.so
-auth        sufficient    pam_unix.so likeauth nullok use_first_pass
-auth        required      pam_deny.so
-
-account     sufficient    pam_winbind.so
-account     required      pam_unix.so
-
-password    required      pam_cracklib.so retry=3
-password    sufficient    pam_unix.so nullok use_authtok md5 shadow
-password    required      pam_deny.so
-
-session     required      pam_mkhomedir.so skel=/etc/skel/ umask=0022 
-session     required      pam_limits.so
-session     required      pam_unix.so
diff --git a/net-fs/samba-libs/samba-libs-3.5.0_rc2.ebuild b/net-fs/samba-libs/samba-libs-3.5.0_rc2.ebuild
deleted file mode 100644
index 514122a97a68..000000000000
--- a/net-fs/samba-libs/samba-libs-3.5.0_rc2.ebuild
+++ /dev/null
@@ -1,281 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-fs/samba-libs/samba-libs-3.5.0_rc2.ebuild,v 1.1 2010/01/26 19:03:35 patrick Exp $
-
-EAPI="2"
-
-inherit pam confutils versionator multilib autotools
-
-MY_PV=${PV/_/}
-MY_P="samba-${MY_PV}"
-
-DESCRIPTION="Library bits of the samba network filesystem"
-HOMEPAGE="http://www.samba.org/"
-SRC_URI="http://samba.org/samba/ftp/rc/${MY_P}.tar.gz"
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
-IUSE="samba4 ads aio caps cluster cups debug examples ldap pam syslog winbind
-	ldb +netapi +smbclient smbsharemodes addns tools"
-
-DEPEND="dev-libs/popt
-	sys-libs/talloc
-	sys-libs/tdb
-	virtual/libiconv
-	ads? ( virtual/krb5 sys-fs/e2fsprogs )
-	caps? ( sys-libs/libcap )
-	cluster? ( dev-db/ctdb )
-	cups? ( net-print/cups )
-	debug? ( dev-libs/dmalloc )
-	ldap? ( net-nds/openldap )
-	pam? ( virtual/pam
-		winbind? ( dev-libs/iniparser ) )
-	syslog? ( virtual/logger )
-	!<net-fs/samba-3.3
-	!=net-fs/samba-server-3.4.3[tools]"
-# last blocker is only temporary for #288516
-
-RDEPEND="${DEPEND}"
-
-# Disable tests since we don't want to build that much here
-RESTRICT="test"
-
-BINPROGS=""
-
-if use tools ; then
-	if use ldb ; then BINPROGS="${BINPROGS} bin/ldbedit bin/ldbsearch bin/ldbadd bin/ldbdel bin/ldbmodify bin/ldbrename"; fi
-fi
-
-S="${WORKDIR}/${MY_P}/source3"
-
-# TODO:
-# - enable iPrint on Prefix/OSX and Darwin?
-# - selftest-prefix? selftest?
-
-CONFDIR="${FILESDIR}/$(get_version_component_range 1-2)"
-
-pkg_setup() {
-	confutils_use_depend_all samba4 ads
-	confutils_use_depend_all ads ldap
-}
-
-src_prepare() {
-
-	cd ".."
-
-	cp "${FILESDIR}/samba-3.4.2-lib.tevent.python.mk" "lib/tevent/python.mk"
-
-	cd "source3"
-	eautoconf -Ilibreplace -Im4 -I../m4 -I../lib/replace -I../source4
-
-	# ensure that winbind has correct ldflags (QA notice)
-	sed -i \
-		-e 's|LDSHFLAGS="|LDSHFLAGS="\\${LDFLAGS} |g' \
-		configure || die "sed failed"
-}
-
-src_configure() {
-	local myconf
-
-	# compile franky samba4 hybrid
-	# http://wiki.samba.org/index.php/Franky
-	if use samba4 ; then
-		myconf="${myconf} --enable-merged-build --enable-developer"
-		if has_version app-crypt/heimdal ; then
-			myconf="${myconf} --with-krb5=/usr/"
-		elif has_version app-crypt/mit-krb5 ; then
-			die "MIT Kerberos not supported by samba 4, use heimdal"
-		else
-			die "No supported kerberos provider detected"
-		fi
-	fi
-
-	# Filter out -fPIE
-	[[ ${CHOST} == *-*bsd* ]] && myconf="${myconf} --disable-pie"
-	use hppa && myconf="${myconf} --disable-pie"
-
-	# Upstream refuses to make this configurable
-	use caps && export ac_cv_header_sys_capability_h=yes || export ac_cv_header_sys_capability_h=no
-
-	# Notes:
-	# - FAM is a plugin for the server
-	# - DNS-SD is only used in client/server code
-	# - AFS is a pw-auth-method and only used in client/server code
-	# - AFSACL is a server module
-	# - automount is only needed in conjunction with NIS and we don't have that
-	# anymore
-	# - quota-support is only needed in server-code
-	# - acl-support is only used in server-code
-	# - --without-dce-dfs and --without-nisplus-home can't be passed to configure but are disabled by default
-	econf ${myconf} \
-		--sysconfdir=/etc/samba \
-		--localstatedir=/var \
-		$(use_enable debug developer) \
-		--enable-largefile \
-		--enable-socket-wrapper \
-		--enable-nss-wrapper \
-		--disable-swat \
-		$(use_enable debug dmalloc) \
-		$(use_enable cups) \
-		--disable-iprint \
-		--disable-fam \
-		--enable-shared-libs \
-		--disable-dnssd \
-		--disable-avahi \
-		--with-fhs \
-		--with-privatedir=/var/lib/samba/private \
-		--with-rootsbindir=/var/cache/samba \
-		--with-lockdir=/var/cache/samba \
-		--with-swatdir=/usr/share/doc/${PF}/swat \
-		--with-configdir=/etc/samba \
-		--with-logfilebase=/var/log/samba \
-		--with-pammodulesdir=$(getpam_mod_dir) \
-		--without-afs \
-		--without-fake-kaserver \
-		--without-vfs-afsacl \
-		$(use_with ldap) \
-		$(use_with ads) \
-		$(use_with ads krb5 /usr) \
-		$(use_with ads dnsupdate) \
-		--without-automount \
-		--without-cifsmount \
-		--without-cifsupcall \
-		$(use_with pam) \
-		$(use_with pam pam_smbpass) \
-		$(use_with syslog) \
-		--without-quotas \
-		--without-sys-quotas \
-		--without-utmp \
-		--without-libtdb \
-		$(use_with netapi libnetapi) \
-		--without-libtalloc \
-		$(use_with smbclient libsmbclient) \
-		$(use_with smbsharemodes libsmbsharemodes) \
-		$(use_with addns libaddns) \
-		$(use_with cluster ctdb /usr) \
-		$(use_with cluster cluster-support) \
-		--without-acl-support \
-		$(use_with aio aio-support) \
-		--with-sendfile-support \
-		$(use_with winbind) \
-		--without-included-popt \
-		--without-included-iniparser
-}
-
-src_compile() {
-
-	# compile libs
-	if use addns ; then
-		einfo "make addns library"
-		emake libaddns || die "emake libaddns failed"
-	fi
-	if use netapi ; then
-		einfo "make netapi library"
-		emake libnetapi || die "emake libnetapi failed"
-	fi
-	if use smbclient ; then
-		einfo "make smbclient library"
-		emake libsmbclient || die "emake libsmbclient failed"
-	fi
-	if use smbsharemodes ; then
-		einfo "make smbsharemodes library"
-		emake libsmbsharemodes || die "emake libsmbsharemodes failed"
-	fi
-
-	# compile modules
-	if use pam ; then
-		einfo "make pam modules"
-		emake pam_modules || die "emake pam_modules failed";
-	fi
-	if use winbind ; then
-		einfo "make nss modules"
-		emake nss_modules || die "emake nss_modules failed";
-	fi
-
-	# compile utilities
-	if use tools ; then
-		einfo "make utilities"
-		emake ${BINPROGS} || die "emake binprogs failed";
-	fi
-
-}
-
-src_install() {
-
-	# install libs
-	if use netapi ; then
-		einfo "install netapi library"
-		emake installlibnetapi DESTDIR="${D}" || die "emake install libnetapi failed"
-	fi
-	if use smbclient ; then
-		einfo "install smbclient library"
-		emake installlibsmbclient DESTDIR="${D}" || die "emake install libsmbclient failed"
-	fi
-	if use smbsharemodes ; then
-		einfo "install smbsharemodes library"
-		emake installlibsmbsharemodes DESTDIR="${D}" || die "emake install libsmbsharemodes failed"
-	fi
-	if use addns ; then
-		einfo "install addns library"
-		emake installlibaddns DESTDIR="${D}" || die "emake install libaddns failed"
-	fi
-
-	# install modules
-	if use pam ; then
-		einfo "install pam modules"
-		emake installpammodules DESTDIR="${D}" || die "emake installpammodules failed"
-	fi
-
-	# Remove empty installation directories
-	rmdir \
-		"${D}/usr/$(get_libdir)/samba" \
-		"${D}/usr"/{sbin,bin} \
-		"${D}/usr/share"/{man,locale,} \
-		"${D}/var"/{run,lib/samba/private,lib/samba,lib,cache/samba,cache,} \
-	#	|| die "tried to remove non-empty dirs, this seems like a bug in the ebuild"
-
-	# Nsswitch extensions. Make link for wins and winbind resolvers
-	if use winbind ; then
-		einfo "install lbwbclient"
-		emake installlibwbclient DESTDIR="${D}" || die "emake installlibwbclient failed"
-		dolib.so ../nsswitch/libnss_wins.so
-		dosym libnss_wins.so /usr/$(get_libdir)/libnss_wins.so.2
-		dolib.so ../nsswitch/libnss_winbind.so
-		dosym libnss_winbind.so /usr/$(get_libdir)/libnss_winbind.so.2
-	fi
-
-	if use pam ; then
-		if use winbind ; then
-			newpamd "${CONFDIR}/system-auth-winbind.pam" system-auth-winbind
-			doman ../docs/manpages/pam_winbind.8
-			dohtml ../docs/htmldocs/manpages/pam_winbind.8.html
-
-			if use examples ; then
-				insinto /usr/share/doc/${PF}/examples
-				doins -r ../examples/pam_winbind
-			fi
-		fi
-
-		newpamd "${CONFDIR}/samba.pam" samba
-		dodoc pam_smbpass/README
-	fi
-
-	# install utilities
-	if use tools && [[ -n "${BINPROGS}" ]] ; then
-		einfo "install utilities"
-		dobin ${BINPROGS} || die "not all bins around"
-		for prog in ${BINPROGS} ; do
-			doman ../docs/manpages/${prog/bin\/}* || die "doman failed"
-			dohtml ../docs/htmldocs/manpages/${prog/bin\/}*.html || die "dohtml failed"
-		done
-	fi
-
-	# install examples
-	if use examples ; then
-		einfo "install examples"
-		insinto /usr/share/doc/${PF}/examples
-		doins -r ../examples/libsmbclient
-		use winbind && doins -r ../examples/nss
-	fi
-
-}
diff --git a/net-fs/samba-libs/samba-libs-3.5.0_rc3.ebuild b/net-fs/samba-libs/samba-libs-3.5.0_rc3.ebuild
deleted file mode 100644
index 046af277f7f4..000000000000
--- a/net-fs/samba-libs/samba-libs-3.5.0_rc3.ebuild
+++ /dev/null
@@ -1,281 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-fs/samba-libs/samba-libs-3.5.0_rc3.ebuild,v 1.1 2010/02/19 17:20:22 patrick Exp $
-
-EAPI="2"
-
-inherit pam confutils versionator multilib autotools
-
-MY_PV=${PV/_/}
-MY_P="samba-${MY_PV}"
-
-DESCRIPTION="Library bits of the samba network filesystem"
-HOMEPAGE="http://www.samba.org/"
-SRC_URI="http://samba.org/samba/ftp/rc/${MY_P}.tar.gz"
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
-IUSE="samba4 ads aio caps cluster cups debug examples ldap pam syslog winbind
-	ldb +netapi +smbclient smbsharemodes addns tools"
-
-DEPEND="dev-libs/popt
-	sys-libs/talloc
-	sys-libs/tdb
-	virtual/libiconv
-	ads? ( virtual/krb5 sys-fs/e2fsprogs )
-	caps? ( sys-libs/libcap )
-	cluster? ( dev-db/ctdb )
-	cups? ( net-print/cups )
-	debug? ( dev-libs/dmalloc )
-	ldap? ( net-nds/openldap )
-	pam? ( virtual/pam
-		winbind? ( dev-libs/iniparser ) )
-	syslog? ( virtual/logger )
-	!<net-fs/samba-3.3
-	!=net-fs/samba-server-3.4.3[tools]"
-# last blocker is only temporary for #288516
-
-RDEPEND="${DEPEND}"
-
-# Disable tests since we don't want to build that much here
-RESTRICT="test"
-
-BINPROGS=""
-
-if use tools ; then
-	if use ldb ; then BINPROGS="${BINPROGS} bin/ldbedit bin/ldbsearch bin/ldbadd bin/ldbdel bin/ldbmodify bin/ldbrename"; fi
-fi
-
-S="${WORKDIR}/${MY_P}/source3"
-
-# TODO:
-# - enable iPrint on Prefix/OSX and Darwin?
-# - selftest-prefix? selftest?
-
-CONFDIR="${FILESDIR}/$(get_version_component_range 1-2)"
-
-pkg_setup() {
-	confutils_use_depend_all samba4 ads
-	confutils_use_depend_all ads ldap
-}
-
-src_prepare() {
-
-	cd ".."
-
-	cp "${FILESDIR}/samba-3.4.2-lib.tevent.python.mk" "lib/tevent/python.mk"
-
-	cd "source3"
-	eautoconf -Ilibreplace -Im4 -I../m4 -I../lib/replace -I../source4
-
-	# ensure that winbind has correct ldflags (QA notice)
-	sed -i \
-		-e 's|LDSHFLAGS="|LDSHFLAGS="\\${LDFLAGS} |g' \
-		configure || die "sed failed"
-}
-
-src_configure() {
-	local myconf
-
-	# compile franky samba4 hybrid
-	# http://wiki.samba.org/index.php/Franky
-	if use samba4 ; then
-		myconf="${myconf} --enable-merged-build --enable-developer"
-		if has_version app-crypt/heimdal ; then
-			myconf="${myconf} --with-krb5=/usr/"
-		elif has_version app-crypt/mit-krb5 ; then
-			die "MIT Kerberos not supported by samba 4, use heimdal"
-		else
-			die "No supported kerberos provider detected"
-		fi
-	fi
-
-	# Filter out -fPIE
-	[[ ${CHOST} == *-*bsd* ]] && myconf="${myconf} --disable-pie"
-	use hppa && myconf="${myconf} --disable-pie"
-
-	# Upstream refuses to make this configurable
-	use caps && export ac_cv_header_sys_capability_h=yes || export ac_cv_header_sys_capability_h=no
-
-	# Notes:
-	# - FAM is a plugin for the server
-	# - DNS-SD is only used in client/server code
-	# - AFS is a pw-auth-method and only used in client/server code
-	# - AFSACL is a server module
-	# - automount is only needed in conjunction with NIS and we don't have that
-	# anymore
-	# - quota-support is only needed in server-code
-	# - acl-support is only used in server-code
-	# - --without-dce-dfs and --without-nisplus-home can't be passed to configure but are disabled by default
-	econf ${myconf} \
-		--sysconfdir=/etc/samba \
-		--localstatedir=/var \
-		$(use_enable debug developer) \
-		--enable-largefile \
-		--enable-socket-wrapper \
-		--enable-nss-wrapper \
-		--disable-swat \
-		$(use_enable debug dmalloc) \
-		$(use_enable cups) \
-		--disable-iprint \
-		--disable-fam \
-		--enable-shared-libs \
-		--disable-dnssd \
-		--disable-avahi \
-		--with-fhs \
-		--with-privatedir=/var/lib/samba/private \
-		--with-rootsbindir=/var/cache/samba \
-		--with-lockdir=/var/cache/samba \
-		--with-swatdir=/usr/share/doc/${PF}/swat \
-		--with-configdir=/etc/samba \
-		--with-logfilebase=/var/log/samba \
-		--with-pammodulesdir=$(getpam_mod_dir) \
-		--without-afs \
-		--without-fake-kaserver \
-		--without-vfs-afsacl \
-		$(use_with ldap) \
-		$(use_with ads) \
-		$(use_with ads krb5 /usr) \
-		$(use_with ads dnsupdate) \
-		--without-automount \
-		--without-cifsmount \
-		--without-cifsupcall \
-		$(use_with pam) \
-		$(use_with pam pam_smbpass) \
-		$(use_with syslog) \
-		--without-quotas \
-		--without-sys-quotas \
-		--without-utmp \
-		--without-libtdb \
-		$(use_with netapi libnetapi) \
-		--without-libtalloc \
-		$(use_with smbclient libsmbclient) \
-		$(use_with smbsharemodes libsmbsharemodes) \
-		$(use_with addns libaddns) \
-		$(use_with cluster ctdb /usr) \
-		$(use_with cluster cluster-support) \
-		--without-acl-support \
-		$(use_with aio aio-support) \
-		--with-sendfile-support \
-		$(use_with winbind) \
-		--without-included-popt \
-		--without-included-iniparser
-}
-
-src_compile() {
-
-	# compile libs
-	if use addns ; then
-		einfo "make addns library"
-		emake libaddns || die "emake libaddns failed"
-	fi
-	if use netapi ; then
-		einfo "make netapi library"
-		emake libnetapi || die "emake libnetapi failed"
-	fi
-	if use smbclient ; then
-		einfo "make smbclient library"
-		emake libsmbclient || die "emake libsmbclient failed"
-	fi
-	if use smbsharemodes ; then
-		einfo "make smbsharemodes library"
-		emake libsmbsharemodes || die "emake libsmbsharemodes failed"
-	fi
-
-	# compile modules
-	if use pam ; then
-		einfo "make pam modules"
-		emake pam_modules || die "emake pam_modules failed";
-	fi
-	if use winbind ; then
-		einfo "make nss modules"
-		emake nss_modules || die "emake nss_modules failed";
-	fi
-
-	# compile utilities
-	if use tools ; then
-		einfo "make utilities"
-		emake ${BINPROGS} || die "emake binprogs failed";
-	fi
-
-}
-
-src_install() {
-
-	# install libs
-	if use netapi ; then
-		einfo "install netapi library"
-		emake installlibnetapi DESTDIR="${D}" || die "emake install libnetapi failed"
-	fi
-	if use smbclient ; then
-		einfo "install smbclient library"
-		emake installlibsmbclient DESTDIR="${D}" || die "emake install libsmbclient failed"
-	fi
-	if use smbsharemodes ; then
-		einfo "install smbsharemodes library"
-		emake installlibsmbsharemodes DESTDIR="${D}" || die "emake install libsmbsharemodes failed"
-	fi
-	if use addns ; then
-		einfo "install addns library"
-		emake installlibaddns DESTDIR="${D}" || die "emake install libaddns failed"
-	fi
-
-	# install modules
-	if use pam ; then
-		einfo "install pam modules"
-		emake installpammodules DESTDIR="${D}" || die "emake installpammodules failed"
-	fi
-
-	# Remove empty installation directories
-	rmdir \
-		"${D}/usr/$(get_libdir)/samba" \
-		"${D}/usr"/{sbin,bin} \
-		"${D}/usr/share"/{man,locale,} \
-		"${D}/var"/{run,lib/samba/private,lib/samba,lib,cache/samba,cache,} \
-	#	|| die "tried to remove non-empty dirs, this seems like a bug in the ebuild"
-
-	# Nsswitch extensions. Make link for wins and winbind resolvers
-	if use winbind ; then
-		einfo "install lbwbclient"
-		emake installlibwbclient DESTDIR="${D}" || die "emake installlibwbclient failed"
-		dolib.so ../nsswitch/libnss_wins.so
-		dosym libnss_wins.so /usr/$(get_libdir)/libnss_wins.so.2
-		dolib.so ../nsswitch/libnss_winbind.so
-		dosym libnss_winbind.so /usr/$(get_libdir)/libnss_winbind.so.2
-	fi
-
-	if use pam ; then
-		if use winbind ; then
-			newpamd "${CONFDIR}/system-auth-winbind.pam" system-auth-winbind
-			doman ../docs/manpages/pam_winbind.8
-			dohtml ../docs/htmldocs/manpages/pam_winbind.8.html
-
-			if use examples ; then
-				insinto /usr/share/doc/${PF}/examples
-				doins -r ../examples/pam_winbind
-			fi
-		fi
-
-		newpamd "${CONFDIR}/samba.pam" samba
-		dodoc pam_smbpass/README
-	fi
-
-	# install utilities
-	if use tools && [[ -n "${BINPROGS}" ]] ; then
-		einfo "install utilities"
-		dobin ${BINPROGS} || die "not all bins around"
-		for prog in ${BINPROGS} ; do
-			doman ../docs/manpages/${prog/bin\/}* || die "doman failed"
-			dohtml ../docs/htmldocs/manpages/${prog/bin\/}*.html || die "dohtml failed"
-		done
-	fi
-
-	# install examples
-	if use examples ; then
-		einfo "install examples"
-		insinto /usr/share/doc/${PF}/examples
-		doins -r ../examples/libsmbclient
-		use winbind && doins -r ../examples/nss
-	fi
-
-}
diff --git a/net-fs/samba-server/ChangeLog b/net-fs/samba-server/ChangeLog
index e4e21fd6ab19..f818562d8a19 100644
--- a/net-fs/samba-server/ChangeLog
+++ b/net-fs/samba-server/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-fs/samba-server
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-fs/samba-server/ChangeLog,v 1.35 2010/02/26 20:17:33 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-fs/samba-server/ChangeLog,v 1.36 2010/03/01 16:25:42 patrick Exp $
+
+  01 Mar 2010; Patrick Lauer <patrick@gentoo.org> -files/3.5/lmhosts,
+  -files/3.5/samba.confd, -files/3.5/samba.initd,
+  -files/3.5/smb.conf.default, -files/3.5/smbusers,
+  -samba-server-3.5.0_rc2.ebuild, -files/3.5/swat.xinetd,
+  -samba-server-3.5.0_rc3.ebuild:
+  Remove 3.5_rc
 
   26 Feb 2010; Patrick Lauer <patrick@gentoo.org>
   -samba-server-3.3.9.ebuild, -samba-server-3.4.4.ebuild,
diff --git a/net-fs/samba-server/Manifest b/net-fs/samba-server/Manifest
index a88f36f367e9..14cb9fb3b733 100644
--- a/net-fs/samba-server/Manifest
+++ b/net-fs/samba-server/Manifest
@@ -11,12 +11,6 @@ AUX 3.4/samba.initd 1143 RMD160 f5c8d70ef76451fc899bd995b1413f6f1f3c9c7e SHA1 f0
 AUX 3.4/smb.conf.default 9660 RMD160 049024e0b489027a44e3ae7b03216ebba8a2d716 SHA1 00954aa58287ef49e9eb0f9f6a04dd509f8835f3 SHA256 8f4fc4d137a32f92b9bc1b64f76ea25a690881cf6f385b9ce9eb0c98f2b0b297
 AUX 3.4/smbusers 225 RMD160 03ecf95c55f6240948e98f922d5f075540ca9e84 SHA1 21af225d65d68eed636bba4658b744c9ae127abb SHA256 d17ed090aa83a071c040416850c01b7eb1d9218159d52aab67250a5d2e68d6cb
 AUX 3.4/swat.xinetd 534 RMD160 46b2c3087fa4cd0b6ea272df4e75e6f9041c9626 SHA1 51caca67c74c269d60bd98504a36837270929e27 SHA256 4c179d3f846b7f82e75ad2729df1ac4d679b10239374013c071aad753cf266e4
-AUX 3.5/lmhosts 133 RMD160 6fe432d84c865201a1dabdd1941003260aac592f SHA1 3c08eee2294a63ba808c5b19f1f2973d4546b5b2 SHA256 877bf2aafe6ee7b325e8024ffeaa5a0856bf155fe99789220c32b90caa3a240a
-AUX 3.5/samba.confd 1219 RMD160 88949f00ea94f14af751e53cf870b6481dc3770d SHA1 a92a63dbbf9f7079e9d7cf0e2e3d608594fe5d42 SHA256 a83004571c4bc37eeaeec8efa0fef4a20d9fc12ec30f2eb9dcc6098251205314
-AUX 3.5/samba.initd 1143 RMD160 b7a5c086c58472cba5901946cd03aac290e7af8c SHA1 b1bd38f660974904f40812f3024f5e0e1b3ad425 SHA256 7ebcd0e1ee32b5228e9fb465f67a4a41579c8dc50729037350f41262abda7f51
-AUX 3.5/smb.conf.default 9660 RMD160 049024e0b489027a44e3ae7b03216ebba8a2d716 SHA1 00954aa58287ef49e9eb0f9f6a04dd509f8835f3 SHA256 8f4fc4d137a32f92b9bc1b64f76ea25a690881cf6f385b9ce9eb0c98f2b0b297
-AUX 3.5/smbusers 225 RMD160 41ed59052964504923396301130b2b657786e544 SHA1 05a7830ebf2cac4a360d0d4dc3876971f5fed8f7 SHA256 25f8a569acf1e5161c7081377e5fb2bd763e59dc8b59f64579b6e71365a3aef9
-AUX 3.5/swat.xinetd 534 RMD160 ce44c3b2c76eb391b8467f6d8a761e3ad8185c5b SHA1 b5ecf19c5f512f3dcd64474ee845429d93a696eb SHA256 d5ffda45f3c71473986b4e1d15397cdd0ae7491215677c7bf4a388eaf8f99b86
 AUX samba-3.4.2-add-zlib-linking.patch 514 RMD160 cf753a11cbc46beb363d060f1326c217de4ea127 SHA1 a541097311deb8ce1ad128ef28198f74f06b667a SHA256 671b675a98afa12aa5e44934891de2d51be55e20595e119e047b11ed3e7038e4
 AUX samba-3.4.2-fix-samba4-automake.patch 1301 RMD160 b72df0fbfff15ce5b9f4f5b89860432ac73442c0 SHA1 7e6bd8a7320472e8b03012f06634c534091cac0a SHA256 8254a2219651afb7884c4dd1297a94ed0f376fe26805058bd7a5d12edf236718
 AUX samba-3.4.2-insert-AC_LD_VERSIONSCRIPT.patch 731 RMD160 648d6f3b78398490ba5da6716ec7e52b41ee236e SHA1 425aa9fa18c9431df4d57768345c80dabc1be5c2 SHA256 7b5ec60126e84957b410c7b0472cc01115c42f213c88b300d1516c616f39de02
@@ -25,11 +19,7 @@ AUX samba-3.4.2-missing_includes.patch 293 RMD160 e32b75ddc4a35f20173db731681eae
 AUX samba-3.4.2-upgrade-tevent-version.patch 288 RMD160 3eb9bbd781d4a92e844ff36824b75f6345c11a97 SHA1 6eec152408b8c18459a7d9413134bc37a6d52b63 SHA256 9171d875322387e7b4f4905067d9310da8e82e9c17cc7d0f0df7d163cffbf414
 DIST samba-3.3.10.tar.gz 26133606 RMD160 da0da8a23ba5f10051ed4257a02b5701602b60a3 SHA1 c98e67468ad9b63dada656b7ac23a875929a8a72 SHA256 93246d97038b885be2930b6ec814c2680f7adc9b7d675fed68c26aed2951ab2c
 DIST samba-3.4.5.tar.gz 35377777 RMD160 c6b73650722d92b1e2d77e7376529014d8e3f67b SHA1 bbd390954d0ced3ac9472c9f0650069b266f083c SHA256 7e4ead58a7c1c0dd1811d6f1df22c6ecf7a1dabf0e46ea7f20a6da9cd457d1ca
-DIST samba-3.5.0rc2.tar.gz 30734155 RMD160 d7f7dedd56443cb69324ed3ac885b0653b10452e SHA1 3867e3d647e999e4ada6ccc04956a116d5250eba SHA256 7ef990822432cff6d4de30f028b4f9b0f43993895a5f7afde79e96dec987f209
-DIST samba-3.5.0rc3.tar.gz 30753086 RMD160 efcf3722c92dfb4c2b61179324d4b3bc334d8fb6 SHA1 e71cbcb14e46ce1c7586bc1eb64e970b5c5cf263 SHA256 91f67f3c199e1cfd25ceacef727f87816c7b687a5a643b57723310f8b23c2499
 EBUILD samba-server-3.3.10.ebuild 6589 RMD160 723b4f9739f5b047bafb078f2ca92fe0af28f198 SHA1 50bd620c6881e7f4cf6d701faba95df4d8a670a9 SHA256 b7d364c2235b26135cc950f9e815b1e6a97688fc590e836d0249e8f83c67250a
 EBUILD samba-server-3.4.5.ebuild 6752 RMD160 1a12e0ab804f1b28193ff9717ad8e5de22239c7e SHA1 97d600f5689bfcb7a9b377ed466f23e34ddc3ee5 SHA256 6b29a01bf5a728921f921419932536519f928d71504042983adbd710c805aa23
-EBUILD samba-server-3.5.0_rc2.ebuild 6548 RMD160 5e4b6764c6f6e8a06945b876433aa3315cacf975 SHA1 00682e4e8907d2522dd9944aac7566a6b1395bdc SHA256 58d98a4856d6cc74d2886a04e32579073916320dd9199700c60ba9195062236b
-EBUILD samba-server-3.5.0_rc3.ebuild 6548 RMD160 676d9799293079ad029617045d0bd207d64c2850 SHA1 7bd18162c04e454386ae5be0e72f3efab2f131d6 SHA256 27e11b653405a35cfeccad759caeaff9ac5753acda39a15cab8efd7fc59c9db3
-MISC ChangeLog 6522 RMD160 39c768fecc948f7ab69aec6fa14fa8aaade507c7 SHA1 8a9c44d59174d804fa27cbc69334137d4d2da984 SHA256 5758f2c17889ab8e5bd3534f82e4cee18fec6875dab91f6146fa04bb5ffc9103
+MISC ChangeLog 6803 RMD160 60893565df124ef8e23a1766fe8b580abec9852d SHA1 4aed0bd66e3af6e13e50ec4aaec44fef15f42a47 SHA256 157a3bf8d0aa678ac9153194370e35a4315d04cdce6df97ca377f57298a60a24
 MISC metadata.xml 940 RMD160 9264339b756dbda92561f05627f452e19dc202f1 SHA1 a1c3233c9b9740064ea5375ccac23fef8a3ccf14 SHA256 9e7cd374d17c4122a9bfe9cb815a2f1b89c3b33ad8ada678d4f1e3b7ce5402d6
diff --git a/net-fs/samba-server/files/3.5/lmhosts b/net-fs/samba-server/files/3.5/lmhosts
deleted file mode 100644
index 014aeaa94d5a..000000000000
--- a/net-fs/samba-server/files/3.5/lmhosts
+++ /dev/null
@@ -1,2 +0,0 @@
-# $Header: /var/cvsroot/gentoo-x86/net-fs/samba-server/files/3.5/lmhosts,v 1.1 2010/01/26 19:04:00 patrick Exp $
-127.0.0.1 localhost
diff --git a/net-fs/samba-server/files/3.5/samba.confd b/net-fs/samba-server/files/3.5/samba.confd
deleted file mode 100644
index 8ef8d7351a27..000000000000
--- a/net-fs/samba-server/files/3.5/samba.confd
+++ /dev/null
@@ -1,28 +0,0 @@
-#add "winbind" to the daemon_list if you also want winbind to start
-daemon_list="smbd nmbd"
-
-#----------------------------------------------------------------------------
-# Daemons calls: <daemon_name>_<command_option>
-#----------------------------------------------------------------------------
-my_service_name="samba"
-my_service_PRE="unset TMP TMPDIR"
-my_service_POST=""
-
-#----------------------------------------------------------------------------
-# Daemons calls: <daemon_name>_<command_option>
-#----------------------------------------------------------------------------
-smbd_start_options="-D"
-smbd_start="start-stop-daemon --start --exec /usr/sbin/smbd -- ${smbd_start_options}"
-smbd_stop="start-stop-daemon --stop --exec /usr/sbin/smbd"
-smbd_reload="killall -HUP smbd"
-
-nmbd_start_options="-D"
-nmbd_start="start-stop-daemon --start --exec /usr/sbin/nmbd -- ${nmbd_start_options}"
-nmbd_stop="start-stop-daemon --stop --exec /usr/sbin/nmbd"
-nmbd_reload="killall -HUP nmbd"
-
-winbind_start_options=""
-winbind_start="start-stop-daemon --start --exec /usr/sbin/winbindd -- ${winbind_start_options}"
-winbind_stop="start-stop-daemon --stop --oknodo --exec /usr/sbin/winbindd"
-winbind_reload="killall -HUP winbindd"
-
diff --git a/net-fs/samba-server/files/3.5/samba.initd b/net-fs/samba-server/files/3.5/samba.initd
deleted file mode 100644
index 574e5ffe49a2..000000000000
--- a/net-fs/samba-server/files/3.5/samba.initd
+++ /dev/null
@@ -1,53 +0,0 @@
-#!/sbin/runscript
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License, v2 or later
-# $Header: /var/cvsroot/gentoo-x86/net-fs/samba-server/files/3.5/samba.initd,v 1.1 2010/01/26 19:04:00 patrick Exp $
-
-opts="reload"
-
-depend() {
-	after slapd
-	need net
-	use cupsd
-}
-
-DAEMONNAME="${SVCNAME##samba.}"
-[ "${DAEMONNAME}" != "samba" ] && daemon_list=${DAEMONNAME}
-
-signal_do() {
-	local signal="$1"
-	[ -z "${signal}" ] && return 0
-
-	local result=0 last_result=0 daemon= cmd_exec=
-	for daemon in ${daemon_list} ; do
-		eval cmd_exec=\$${daemon}_${signal}
-		if [ -n "${cmd_exec}" ]; then
-			ebegin "${my_service_name} -> ${signal}: ${daemon}"
-			#echo ${cmd} '->' ${!cmd}
-			${cmd_exec} > /dev/null
-			last_result=$?
-			eend ${last_result}
-		fi
-		result=$(( ${result} + ${last_result} ))
-	done
-	return ${result}
-}
-start() {
-	${my_service_PRE}
-	signal_do start && return 0
-	
-	eerror "Error: starting services (see system logs)"
-	signal_do stop
-	return 1
-}
-stop() {
-	${my_service_PRE}
-	if signal_do stop ; then
-	    ${my_service_POST}
-	    return 0
-	fi
-}
-reload() {
-	${my_service_PRE}
-	signal_do reload
-}
diff --git a/net-fs/samba-server/files/3.5/smb.conf.default b/net-fs/samba-server/files/3.5/smb.conf.default
deleted file mode 100644
index 4c9a4a6d529f..000000000000
--- a/net-fs/samba-server/files/3.5/smb.conf.default
+++ /dev/null
@@ -1,271 +0,0 @@
-# This is the main Samba configuration file. You should read the
-# smb.conf(5) manual page in order to understand the options listed
-# here. Samba has a huge number of configurable options (perhaps too
-# many!) most of which are not shown in this example
-#
-# For a step to step guide on installing, configuring and using samba, 
-# read the Samba-HOWTO-Collection. This may be obtained from:
-#  http://www.samba.org/samba/docs/Samba-HOWTO-Collection.pdf
-#
-# Many working examples of smb.conf files can be found in the 
-# Samba-Guide which is generated daily and can be downloaded from: 
-#  http://www.samba.org/samba/docs/Samba-Guide.pdf
-#
-# Any line which starts with a ; (semi-colon) or a # (hash) 
-# is a comment and is ignored. In this example we will use a #
-# for commentry and a ; for parts of the config file that you
-# may wish to enable
-#
-# NOTE: Whenever you modify this file you should run the command "testparm"
-# to check that you have not made any basic syntactic errors. 
-#
-#======================= Global Settings =====================================
-[global]
-
-# workgroup = NT-Domain-Name or Workgroup-Name, eg: MIDEARTH
-   workgroup = MYGROUP
-
-# server string is the equivalent of the NT Description field
-   server string = Samba Server
-
-# Security mode. Defines in which mode Samba will operate. Possible 
-# values are share, user, server, domain and ads. Most people will want 
-# user level security. See the Samba-HOWTO-Collection for details.
-   security = user
-
-# This option is important for security. It allows you to restrict
-# connections to machines which are on your local network. The
-# following example restricts access to two C class networks and
-# the "loopback" interface. For more examples of the syntax see
-# the smb.conf man page
-;   hosts allow = 192.168.1. 192.168.2. 127.
-
-# If you want to automatically load your printer list rather
-# than setting them up individually then you'll need this
-   load printers = yes
-
-# you may wish to override the location of the printcap file
-;   printcap name = /etc/printcap
-
-# on SystemV system setting printcap name to lpstat should allow
-# you to automatically obtain a printer list from the SystemV spool
-# system
-;   printcap name = lpstat
-
-# It should not be necessary to specify the print system type unless
-# it is non-standard. Currently supported print systems include:
-# bsd, cups, sysv, plp, lprng, aix, hpux, qnx
-;   printing = cups
-
-# Uncomment this if you want a guest account, you must add this to /etc/passwd
-# otherwise the user "nobody" is used
-;  guest account = pcguest
-
-# this tells Samba to use a separate log file for each machine
-# that connects
-   log file = /var/log/samba/log.%m
-
-# Put a capping on the size of the log files (in Kb).
-   max log size = 50
-
-# Use password server option only with security = server
-# The argument list may include:
-#   password server = My_PDC_Name [My_BDC_Name] [My_Next_BDC_Name]
-# or to auto-locate the domain controller/s
-#   password server = *
-;   password server = <NT-Server-Name>
-
-# Use the realm option only with security = ads
-# Specifies the Active Directory realm the host is part of
-;   realm = MY_REALM
-
-# Backend to store user information in. New installations should 
-# use either tdbsam or ldapsam. smbpasswd is available for backwards 
-# compatibility. tdbsam requires no further configuration.
-;   passdb backend = tdbsam
-
-# Using the following line enables you to customise your configuration
-# on a per machine basis. The %m gets replaced with the netbios name
-# of the machine that is connecting.
-# Note: Consider carefully the location in the configuration file of
-#       this line.  The included file is read at that point.
-;   include = /etc/samba/smb.conf.%m
-
-# Configure Samba to use multiple interfaces
-# If you have multiple network interfaces then you must list them
-# here. See the man page for details.
-;   interfaces = 192.168.12.2/24 192.168.13.2/24 
-
-# Browser Control Options:
-# set local master to no if you don't want Samba to become a master
-# browser on your network. Otherwise the normal election rules apply
-;   local master = no
-
-# OS Level determines the precedence of this server in master browser
-# elections. The default value should be reasonable
-;   os level = 33
-
-# Domain Master specifies Samba to be the Domain Master Browser. This
-# allows Samba to collate browse lists between subnets. Don't use this
-# if you already have a Windows NT domain controller doing this job
-;   domain master = yes 
-
-# Preferred Master causes Samba to force a local browser election on startup
-# and gives it a slightly higher chance of winning the election
-;   preferred master = yes
-
-# Enable this if you want Samba to be a domain logon server for 
-# Windows95 workstations. 
-;   domain logons = yes
-
-# if you enable domain logons then you may want a per-machine or
-# per user logon script
-# run a specific logon batch file per workstation (machine)
-;   logon script = %m.bat
-# run a specific logon batch file per username
-;   logon script = %U.bat
-
-# Where to store roving profiles (only for Win95 and WinNT)
-#        %L substitutes for this servers netbios name, %U is username
-#        You must uncomment the [Profiles] share below
-;   logon path = \\%L\Profiles\%U
-
-# Windows Internet Name Serving Support Section:
-# WINS Support - Tells the NMBD component of Samba to enable it's WINS Server
-;   wins support = yes
-
-# WINS Server - Tells the NMBD components of Samba to be a WINS Client
-#	Note: Samba can be either a WINS Server, or a WINS Client, but NOT both
-;   wins server = w.x.y.z
-
-# WINS Proxy - Tells Samba to answer name resolution queries on
-# behalf of a non WINS capable client, for this to work there must be
-# at least one	WINS Server on the network. The default is NO.
-;   wins proxy = yes
-
-# DNS Proxy - tells Samba whether or not to try to resolve NetBIOS names
-# via DNS nslookups. The default is NO.
-   dns proxy = no 
-
-# These scripts are used on a domain controller or stand-alone 
-# machine to add or delete corresponding unix accounts
-;  add user script = /usr/sbin/useradd %u
-;  add group script = /usr/sbin/groupadd %g
-;  add machine script = /usr/sbin/adduser -n -g machines -c Machine -d /dev/null -s /bin/false %u
-;  delete user script = /usr/sbin/userdel %u
-;  delete user from group script = /usr/sbin/deluser %u %g
-;  delete group script = /usr/sbin/groupdel %g
-
-
-#============================ Share Definitions ==============================
-[homes]
-   comment = Home Directories
-   browseable = no
-   writable = yes
-
-# Un-comment the following and create the netlogon directory for Domain Logons
-; [netlogon]
-;   comment = Network Logon Service
-;   path = /var/lib/samba/netlogon
-;   guest ok = yes
-;   writable = no
-;   share modes = no
-
-
-# Un-comment the following to provide a specific roving profile share
-# the default is to use the user's home directory
-;[Profiles]
-;    path = /var/lib/samba/profiles
-;    browseable = no
-;    guest ok = yes
-
-
-# NOTE: If you have a BSD-style print system there is no need to 
-# specifically define each individual printer
-[printers]
-   comment = All Printers
-   path = /var/spool/samba
-   browseable = no
-# Set public = yes to allow user 'guest account' to print
-   guest ok = no
-   writable = no
-   printable = yes
-
-# This one is useful for people to share files
-;[tmp]
-;   comment = Temporary file space
-;   path = /tmp
-;   read only = no
-;   public = yes
-
-# A publicly accessible directory, but read only, except for people in
-# the "staff" group
-;[public]
-;   comment = Public Stuff
-;   path = /home/samba
-;   public = yes
-;   writable = yes
-;   printable = no
-;   write list = @staff
-
-# Other examples. 
-#
-# A private printer, usable only by fred. Spool data will be placed in fred's
-# home directory. Note that fred must have write access to the spool directory,
-# wherever it is.
-;[fredsprn]
-;   comment = Fred's Printer
-;   valid users = fred
-;   path = /homes/fred
-;   printer = freds_printer
-;   public = no
-;   writable = no
-;   printable = yes
-
-# A private directory, usable only by fred. Note that fred requires write
-# access to the directory.
-;[fredsdir]
-;   comment = Fred's Service
-;   path = /usr/somewhere/private
-;   valid users = fred
-;   public = no
-;   writable = yes
-;   printable = no
-
-# a service which has a different directory for each machine that connects
-# this allows you to tailor configurations to incoming machines. You could
-# also use the %U option to tailor it by user name.
-# The %m gets replaced with the machine name that is connecting.
-;[pchome]
-;  comment = PC Directories
-;  path = /usr/pc/%m
-;  public = no
-;  writable = yes
-
-# A publicly accessible directory, read/write to all users. Note that all files
-# created in the directory by users will be owned by the default user, so
-# any user with access can delete any other user's files. Obviously this
-# directory must be writable by the default user. Another user could of course
-# be specified, in which case all files would be owned by that user instead.
-;[public]
-;   path = /usr/somewhere/else/public
-;   public = yes
-;   only guest = yes
-;   writable = yes
-;   printable = no
-
-# The following two entries demonstrate how to share a directory so that two
-# users can place files there that will be owned by the specific users. In this
-# setup, the directory should be writable by both users and should have the
-# sticky bit set on it to prevent abuse. Obviously this could be extended to
-# as many users as required.
-;[myshare]
-;   comment = Mary's and Fred's stuff
-;   path = /usr/somewhere/shared
-;   valid users = mary fred
-;   public = no
-;   writable = yes
-;   printable = no
-;   create mask = 0765
-
-
diff --git a/net-fs/samba-server/files/3.5/smbusers b/net-fs/samba-server/files/3.5/smbusers
deleted file mode 100644
index 871a99090d30..000000000000
--- a/net-fs/samba-server/files/3.5/smbusers
+++ /dev/null
@@ -1,7 +0,0 @@
-# $Header: /var/cvsroot/gentoo-x86/net-fs/samba-server/files/3.5/smbusers,v 1.1 2010/01/26 19:04:00 patrick Exp $
-
-# Syntax:
-#   Unix_name = SMB_name1 SMB_name2 ...
-
-root = Administrator admin
-nobody = guest pcguest smbguest
diff --git a/net-fs/samba-server/files/3.5/swat.xinetd b/net-fs/samba-server/files/3.5/swat.xinetd
deleted file mode 100644
index b5bf0fe5500b..000000000000
--- a/net-fs/samba-server/files/3.5/swat.xinetd
+++ /dev/null
@@ -1,17 +0,0 @@
-# default: off
-# description: SWAT is the Samba Web Admin Tool. Use swat \
-#	       to configure your Samba server. To use SWAT, \
-#	       connect to port 901 with your favorite web browser.
-# $Header: /var/cvsroot/gentoo-x86/net-fs/samba-server/files/3.5/swat.xinetd,v 1.1 2010/01/26 19:04:00 patrick Exp $
-
-service swat
-{
-	port            = 901
-	socket_type     = stream
-	wait            = no
-	only_from       = localhost
-	user            = root
-	server          = /usr/sbin/swat
-	log_on_failure += USERID
-	disable         = yes
-}
diff --git a/net-fs/samba-server/samba-server-3.5.0_rc2.ebuild b/net-fs/samba-server/samba-server-3.5.0_rc2.ebuild
deleted file mode 100644
index 67d7e5cc1eff..000000000000
--- a/net-fs/samba-server/samba-server-3.5.0_rc2.ebuild
+++ /dev/null
@@ -1,223 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-fs/samba-server/samba-server-3.5.0_rc2.ebuild,v 1.1 2010/01/26 19:03:59 patrick Exp $
-
-EAPI="2"
-
-inherit pam confutils versionator multilib autotools
-
-MY_PV=${PV/_/}
-MY_P="samba-${MY_PV}"
-
-DESCRIPTION="Samba Server component"
-HOMEPAGE="http://www.samba.org/"
-SRC_URI="http://samba.org/samba/ftp/rc/${MY_P}.tar.gz"
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
-IUSE="samba4 acl ads aio avahi caps cluster cups debug doc examples fam ldap pam quota swat syslog winbind zeroconf"
-
-DEPEND="!<net-fs/samba-3.3
-	ads? ( virtual/krb5 sys-fs/e2fsprogs net-fs/samba-libs[ads] )
-	dev-libs/popt
-	virtual/libiconv
-	avahi? ( net-dns/avahi )
-	zeroconf? ( !avahi? ( || ( net-dns/avahi[mdnsresponder-compat] net-misc/mDNSResponder ) ) )
-	caps? ( sys-libs/libcap )
-	cups? ( net-print/cups )
-	debug? ( dev-libs/dmalloc )
-	fam? ( dev-libs/libgamin )
-	ldap? ( net-nds/openldap )
-	pam? ( sys-libs/pam )
-	syslog? ( virtual/logger )
-	sys-libs/tdb
-	sys-libs/talloc
-	~net-fs/samba-libs-${PV}[caps?,cluster?,cups?,ldap?,syslog?,winbind?,ads?,samba4?]"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/${MY_P}/source3"
-
-RESTRICT="test"
-
-CONFDIR="${FILESDIR}/$(get_version_component_range 1-2)"
-SBINPROGS="bin/smbd bin/nmbd"
-BINPROGS="bin/testparm bin/smbstatus bin/smbcontrol bin/pdbedit
-	bin/profiles bin/sharesec bin/eventlogadm"
-#bin/ldbedit bin/ldbsearch bin/ldbadd bin/ldbdel bin/ldbmodify bin/ldbrename"
-
-pkg_setup() {
-	confutils_use_depend_all samba4 ads
-	confutils_use_depend_all ads ldap
-}
-
-src_prepare() {
-
-	cd ".."
-
-	cp "${FILESDIR}/samba-3.4.2-lib.tevent.python.mk" "lib/tevent/python.mk"
-
-	cd "source3"
-	eautoconf -Ilibreplace -Im4 -I../m4 -I../lib/replace -I../source4
-}
-
-src_configure() {
-	local myconf
-
-	# compile franky samba4 hybrid
-	# http://wiki.samba.org/index.php/Franky
-	if use samba4 ; then
-		myconf="${myconf} --enable-merged-build --enable-developer"
-		if has_version app-crypt/heimdal ; then
-			myconf="${myconf} --with-krb5=/usr/"
-		elif has_version app-crypt/mit-krb5 ; then
-			die "MIT Kerberos not supported by samba 4, use heimdal"
-		else
-			die "No supported kerberos provider detected"
-		fi
-	fi
-
-	# Filter out -fPIE
-	[[ ${CHOST} == *-*bsd* ]] && myconf="${myconf} --disable-pie"
-	use hppa && myconf="${myconf} --disable-pie"
-
-	# Upstream refuses to make this configurable
-	export ac_cv_header_sys_capability_h=no
-	use caps && export ac_cv_header_sys_capability_h=yes
-
-	local dnssd="--disable-dnssd"
-	use zeroconf && ! use avahi && dnssd="--enable-dnssd"
-
-	# Notes:
-	# - FAM is a plugin for the server
-	# - DNS-SD is only used in client/server code
-	# - AFS is a pw-auth-method and only used in client/server code
-	# - AFSACL is a server module
-	# - automount is only needed in conjunction with NIS and we don't have that
-	# anymore
-	# - quota-support is only needed in server-code
-	# - acl-support is only used in server-code
-	# - --without-dce-dfs and --without-nisplus-home can't be passed to configure but are disabled by default
-
-	econf ${myconf} \
-		--with-piddir=/var/run/samba \
-		--sysconfdir=/etc/samba \
-		--localstatedir=/var \
-		$(use_enable debug developer) \
-		--enable-largefile \
-		--enable-socket-wrapper \
-		--enable-nss-wrapper \
-		$(use_enable swat) \
-		$(use_enable debug dmalloc) \
-		$(use_enable cups) \
-		--disable-iprint \
-		$(use_enable fam) \
-		--enable-shared-libs \
-		${dnssd} \
-		$(use_enable avahi) \
-		--with-fhs \
-		--with-privatedir=/var/lib/samba/private \
-		--with-rootsbindir=/var/cache/samba \
-		--with-lockdir=/var/cache/samba \
-		--with-swatdir=/usr/share/doc/${PF}/swat \
-		--with-configdir=/etc/samba \
-		--with-logfilebase=/var/log/samba \
-		--with-pammodulesdir=$(getpam_mod_dir) \
-		--without-afs \
-		--without-fake-kaserver \
-		--without-vfs-afsacl \
-		$(use_with ldap) \
-		$(use_with ads) \
-		$(use_with ads krb5 /usr) \
-		$(use_with ads dnsupdate) \
-		--without-automount \
-		--without-cifsmount \
-		--without-cifsupcall \
-		$(use_with pam ) \
-		$(use_with pam pam_smbpass ) \
-		$(use_with syslog) \
-		$(use_with quota quotas) \
-		$(use_with quota sys-quotas) \
-		--without-utmp \
-		--without-lib{talloc,tdb,netapi,smbclient,smbsharemodes} \
-		--without-libaddns \
-		$(use_with cluster ctdb /usr) \
-		$(use_with cluster cluster-support) \
-		$(use_with acl acl-support) \
-		$(use_with aio aio-support) \
-		--with-sendfile-support \
-		$(use_with winbind)
-
-	use swat && SBINPROGS="${SBINPROGS} bin/swat"
-	use winbind && SBINPROGS="${SBINPROGS} bin/winbindd"
-	use ads && use winbind && SBIN_PROGS="${SBINPROGS} bin/winbind_krb5_locator"
-
-	use winbind && BINPROGS="${BINPROGS} bin/wbinfo"
-}
-
-src_compile() {
-	emake ${SBINPROGS} || die "building server binaries failed"
-	emake modules || die "building modules failed"
-	emake ${BINPROGS} || die "building binaries failed"
-}
-
-src_install() {
-	dosbin ${SBINPROGS} || die "installing server binaries failed"
-
-	emake DESTDIR="${D}" installmodules || die "installing modules failed"
-
-	dobin ${BINPROGS} || die "installing binaries failed"
-
-	for prog in ${BINPROGS} ${SBINPROGS} ; do
-		doman ../docs/manpages/${prog/bin\/}*
-	done
-
-	doman ../docs/manpages/vfs* ../docs/manpages/samba.7 ../docs/manpages/smb.conf.5
-
-	diropts -m0700
-	keepdir /var/lib/samba/private
-
-	diropts -m1777
-	keepdir /var/spool/samba
-
-	diropts -m0755
-	keepdir /var/{cache,log}/samba
-	keepdir /var/lib/samba/{netlogon,profiles}
-	keepdir /var/lib/samba/printers/{W32X86,WIN40,W32ALPHA,W32MIPS,W32PPC,X64,IA64,COLOR}
-	keepdir /usr/$(get_libdir)/samba/{auth,pdb,rpc,idmap,nss_info,gpext}
-
-	newconfd "${CONFDIR}/samba.confd" samba
-	newinitd "${CONFDIR}/samba.initd" samba
-
-	insinto /etc/samba
-	doins "${CONFDIR}"/{smbusers,lmhosts,smb.conf.default}
-
-	insinto /usr/"$(get_libdir)"/samba
-	doins ../codepages/{valid.dat,upcase.dat,lowcase.dat}
-
-	if use ldap ; then
-		insinto /etc/openldap/schema
-		doins ../examples/LDAP/samba.schema
-	fi
-
-	if use swat ; then
-		insinto /etc/xinetd.d
-		newins "${CONFDIR}/swat.xinetd" swat
-		script/installswat.sh "${D}" "${ROOT}/usr/share/doc/${PF}/swat" "${S}" \
-		|| die "installing swat failed"
-	fi
-
-	dodoc ../MAINTAINERS ../README* ../Roadmap ../WHATSNEW.txt ../docs/THANKS
-
-	if use doc ; then
-		dohtml -r ../docs/htmldocs/*
-		dodoc ../docs/*.pdf
-	fi
-
-	if use examples ; then
-		cd ../examples
-		insinto /usr/share/doc/${PF}/examples
-		doins -r \
-			auth autofs dce-dfs LDAP logon misc pdb perfcounter \
-			printer-accounting printing scripts tridge validchars VFS
-	fi
-}
diff --git a/net-fs/samba-server/samba-server-3.5.0_rc3.ebuild b/net-fs/samba-server/samba-server-3.5.0_rc3.ebuild
deleted file mode 100644
index 8ecc494a1d8f..000000000000
--- a/net-fs/samba-server/samba-server-3.5.0_rc3.ebuild
+++ /dev/null
@@ -1,223 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-fs/samba-server/samba-server-3.5.0_rc3.ebuild,v 1.1 2010/02/19 17:20:46 patrick Exp $
-
-EAPI="2"
-
-inherit pam confutils versionator multilib autotools
-
-MY_PV=${PV/_/}
-MY_P="samba-${MY_PV}"
-
-DESCRIPTION="Samba Server component"
-HOMEPAGE="http://www.samba.org/"
-SRC_URI="http://samba.org/samba/ftp/rc/${MY_P}.tar.gz"
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
-IUSE="samba4 acl ads aio avahi caps cluster cups debug doc examples fam ldap pam quota swat syslog winbind zeroconf"
-
-DEPEND="!<net-fs/samba-3.3
-	ads? ( virtual/krb5 sys-fs/e2fsprogs net-fs/samba-libs[ads] )
-	dev-libs/popt
-	virtual/libiconv
-	avahi? ( net-dns/avahi )
-	zeroconf? ( !avahi? ( || ( net-dns/avahi[mdnsresponder-compat] net-misc/mDNSResponder ) ) )
-	caps? ( sys-libs/libcap )
-	cups? ( net-print/cups )
-	debug? ( dev-libs/dmalloc )
-	fam? ( dev-libs/libgamin )
-	ldap? ( net-nds/openldap )
-	pam? ( sys-libs/pam )
-	syslog? ( virtual/logger )
-	sys-libs/tdb
-	sys-libs/talloc
-	~net-fs/samba-libs-${PV}[caps?,cluster?,cups?,ldap?,syslog?,winbind?,ads?,samba4?]"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/${MY_P}/source3"
-
-RESTRICT="test"
-
-CONFDIR="${FILESDIR}/$(get_version_component_range 1-2)"
-SBINPROGS="bin/smbd bin/nmbd"
-BINPROGS="bin/testparm bin/smbstatus bin/smbcontrol bin/pdbedit
-	bin/profiles bin/sharesec bin/eventlogadm"
-#bin/ldbedit bin/ldbsearch bin/ldbadd bin/ldbdel bin/ldbmodify bin/ldbrename"
-
-pkg_setup() {
-	confutils_use_depend_all samba4 ads
-	confutils_use_depend_all ads ldap
-}
-
-src_prepare() {
-
-	cd ".."
-
-	cp "${FILESDIR}/samba-3.4.2-lib.tevent.python.mk" "lib/tevent/python.mk"
-
-	cd "source3"
-	eautoconf -Ilibreplace -Im4 -I../m4 -I../lib/replace -I../source4
-}
-
-src_configure() {
-	local myconf
-
-	# compile franky samba4 hybrid
-	# http://wiki.samba.org/index.php/Franky
-	if use samba4 ; then
-		myconf="${myconf} --enable-merged-build --enable-developer"
-		if has_version app-crypt/heimdal ; then
-			myconf="${myconf} --with-krb5=/usr/"
-		elif has_version app-crypt/mit-krb5 ; then
-			die "MIT Kerberos not supported by samba 4, use heimdal"
-		else
-			die "No supported kerberos provider detected"
-		fi
-	fi
-
-	# Filter out -fPIE
-	[[ ${CHOST} == *-*bsd* ]] && myconf="${myconf} --disable-pie"
-	use hppa && myconf="${myconf} --disable-pie"
-
-	# Upstream refuses to make this configurable
-	export ac_cv_header_sys_capability_h=no
-	use caps && export ac_cv_header_sys_capability_h=yes
-
-	local dnssd="--disable-dnssd"
-	use zeroconf && ! use avahi && dnssd="--enable-dnssd"
-
-	# Notes:
-	# - FAM is a plugin for the server
-	# - DNS-SD is only used in client/server code
-	# - AFS is a pw-auth-method and only used in client/server code
-	# - AFSACL is a server module
-	# - automount is only needed in conjunction with NIS and we don't have that
-	# anymore
-	# - quota-support is only needed in server-code
-	# - acl-support is only used in server-code
-	# - --without-dce-dfs and --without-nisplus-home can't be passed to configure but are disabled by default
-
-	econf ${myconf} \
-		--with-piddir=/var/run/samba \
-		--sysconfdir=/etc/samba \
-		--localstatedir=/var \
-		$(use_enable debug developer) \
-		--enable-largefile \
-		--enable-socket-wrapper \
-		--enable-nss-wrapper \
-		$(use_enable swat) \
-		$(use_enable debug dmalloc) \
-		$(use_enable cups) \
-		--disable-iprint \
-		$(use_enable fam) \
-		--enable-shared-libs \
-		${dnssd} \
-		$(use_enable avahi) \
-		--with-fhs \
-		--with-privatedir=/var/lib/samba/private \
-		--with-rootsbindir=/var/cache/samba \
-		--with-lockdir=/var/cache/samba \
-		--with-swatdir=/usr/share/doc/${PF}/swat \
-		--with-configdir=/etc/samba \
-		--with-logfilebase=/var/log/samba \
-		--with-pammodulesdir=$(getpam_mod_dir) \
-		--without-afs \
-		--without-fake-kaserver \
-		--without-vfs-afsacl \
-		$(use_with ldap) \
-		$(use_with ads) \
-		$(use_with ads krb5 /usr) \
-		$(use_with ads dnsupdate) \
-		--without-automount \
-		--without-cifsmount \
-		--without-cifsupcall \
-		$(use_with pam ) \
-		$(use_with pam pam_smbpass ) \
-		$(use_with syslog) \
-		$(use_with quota quotas) \
-		$(use_with quota sys-quotas) \
-		--without-utmp \
-		--without-lib{talloc,tdb,netapi,smbclient,smbsharemodes} \
-		--without-libaddns \
-		$(use_with cluster ctdb /usr) \
-		$(use_with cluster cluster-support) \
-		$(use_with acl acl-support) \
-		$(use_with aio aio-support) \
-		--with-sendfile-support \
-		$(use_with winbind)
-
-	use swat && SBINPROGS="${SBINPROGS} bin/swat"
-	use winbind && SBINPROGS="${SBINPROGS} bin/winbindd"
-	use ads && use winbind && SBIN_PROGS="${SBINPROGS} bin/winbind_krb5_locator"
-
-	use winbind && BINPROGS="${BINPROGS} bin/wbinfo"
-}
-
-src_compile() {
-	emake ${SBINPROGS} || die "building server binaries failed"
-	emake modules || die "building modules failed"
-	emake ${BINPROGS} || die "building binaries failed"
-}
-
-src_install() {
-	dosbin ${SBINPROGS} || die "installing server binaries failed"
-
-	emake DESTDIR="${D}" installmodules || die "installing modules failed"
-
-	dobin ${BINPROGS} || die "installing binaries failed"
-
-	for prog in ${BINPROGS} ${SBINPROGS} ; do
-		doman ../docs/manpages/${prog/bin\/}*
-	done
-
-	doman ../docs/manpages/vfs* ../docs/manpages/samba.7 ../docs/manpages/smb.conf.5
-
-	diropts -m0700
-	keepdir /var/lib/samba/private
-
-	diropts -m1777
-	keepdir /var/spool/samba
-
-	diropts -m0755
-	keepdir /var/{cache,log}/samba
-	keepdir /var/lib/samba/{netlogon,profiles}
-	keepdir /var/lib/samba/printers/{W32X86,WIN40,W32ALPHA,W32MIPS,W32PPC,X64,IA64,COLOR}
-	keepdir /usr/$(get_libdir)/samba/{auth,pdb,rpc,idmap,nss_info,gpext}
-
-	newconfd "${CONFDIR}/samba.confd" samba
-	newinitd "${CONFDIR}/samba.initd" samba
-
-	insinto /etc/samba
-	doins "${CONFDIR}"/{smbusers,lmhosts,smb.conf.default}
-
-	insinto /usr/"$(get_libdir)"/samba
-	doins ../codepages/{valid.dat,upcase.dat,lowcase.dat}
-
-	if use ldap ; then
-		insinto /etc/openldap/schema
-		doins ../examples/LDAP/samba.schema
-	fi
-
-	if use swat ; then
-		insinto /etc/xinetd.d
-		newins "${CONFDIR}/swat.xinetd" swat
-		script/installswat.sh "${D}" "${ROOT}/usr/share/doc/${PF}/swat" "${S}" \
-		|| die "installing swat failed"
-	fi
-
-	dodoc ../MAINTAINERS ../README* ../Roadmap ../WHATSNEW.txt ../docs/THANKS
-
-	if use doc ; then
-		dohtml -r ../docs/htmldocs/*
-		dodoc ../docs/*.pdf
-	fi
-
-	if use examples ; then
-		cd ../examples
-		insinto /usr/share/doc/${PF}/examples
-		doins -r \
-			auth autofs dce-dfs LDAP logon misc pdb perfcounter \
-			printer-accounting printing scripts tridge validchars VFS
-	fi
-}
author	Patrick Lauer <patrick@gentoo.org>	2010-03-01 16:25:43 +0000
committer	Patrick Lauer <patrick@gentoo.org>	2010-03-01 16:25:43 +0000
commit	8b0e63d00f8879734c708df7d66b8e9f11d72e53 (patch)
tree	6006e4a714be276a22fbd32165266bb6fcc31ba5 /net-fs
parent	Bump to monolithic 3.5 (diff)
download	historical-8b0e63d00f8879734c708df7d66b8e9f11d72e53.tar.gz historical-8b0e63d00f8879734c708df7d66b8e9f11d72e53.tar.bz2 historical-8b0e63d00f8879734c708df7d66b8e9f11d72e53.zip