cleanup

5 files changed, 7 insertions, 764 deletions

diff --git a/net-fs/samba/Manifest b/net-fs/samba/Manifest
index ab41fa4447e0..c14844e3ab65 100644
--- a/net-fs/samba/Manifest
+++ b/net-fs/samba/Manifest
@@ -1,15 +1,9 @@
 MD5 2b958f46abfd568fbdad78a7e4c7a4b1 ChangeLog 11914
-MD5 b4f7c9e6b05c610bf52033ed430de265 samba-2.2.8.ebuild 10688
 MD5 11978d96cfebe10cabfbc2c6da2f04ee samba-2.2.8a.ebuild 10853
-MD5 952110f64c7d71ef5c90e6ff41331f61 samba-3.0.0-r1.ebuild 10762
 MD5 f9ae9b62d92d4006947fea94e0dd8db2 samba-3.0.0.ebuild 9474
-MD5 eb3b540cc665551c42cae5d04e84cba5 samba-3.0.0_rc4.ebuild 9605
+MD5 952110f64c7d71ef5c90e6ff41331f61 samba-3.0.0-r1.ebuild 10762
 MD5 fd2382184b6a07e63cb07ff26b578fd2 files/config-svc-smbd+nmbd 784
-MD5 f81075bc9908642f554abe7b46124a00 files/digest-samba-2.2.8 134
 MD5 9780745de080ee53a34c1b2f9fb1f228 files/digest-samba-2.2.8a 135
-MD5 00dd502e04f67e67fbb6164b6b4669c7 files/digest-samba-3.0.0 135
-MD5 9ad118eb4f2d3eff69927ab1ab1913be files/digest-samba-3.0.0-r1 202
-MD5 800c440c35d319c5243d944683759acf files/digest-samba-3.0.0_rc4 138
 MD5 b610fd35d7a0a9de510e31d85345d14a files/lmhosts 124
 MD5 f402c2c4103f4c13ac3cc5fa165940db files/nonroot-bind.diff 757
 MD5 5d3129a0f6bcbec6ec91d217881a34e1 files/nsswitch.conf-winbind 298
@@ -17,17 +11,19 @@ MD5 092f8dd0b4f6f5da13ce2daafb534978 files/nsswitch.conf-wins 390
 MD5 20997c75e29fec20efbb2cd6695cd3a9 files/recycle.conf 776
 MD5 cbaa5a39d9bd67b13f8131b426a4256b files/samba-2.2.5-gp-reloc-fix.patch 431
 MD5 8289eda694b35875eec6df5cc3f50c86 files/samba-2.2.6-libresolv.patch 540
-MD5 60e527174c1b2c53126dbbedb3cae0f7 files/samba-2.2.8-statfs.patch 209
-MD5 516ca38dfc67b7cd7356f93ad2cf75b9 files/samba-3.0.0-python-setup.patch 767
 MD5 e66c856d458f6ded226460c605854547 files/samba-init 892
-MD5 9560b7e29d3a65db029fc1800e84abcc files/samba-pdb_ldap-exop.patch 3921
 MD5 9faccd0fa1bfb58b4ffa0e9dd01e1ec6 files/samba-slapd-include.conf 497
 MD5 16a0f8dc632f6701c1fe5832488cc43e files/samba-svc 994
 MD5 b6cdc1468e45f92f19873e0c6c5b6e94 files/samba.pam 332
 MD5 2a8e771c143fc19819c4b6bd022f12ed files/smb.conf.example 16181
-MD5 b39fdb68b4b97d739e296edd1798c67f files/smb.conf.example-samba3 20707
 MD5 cf9aae0d1cf55f47d1434f6bf1cee52e files/smbldap_conf.pm 7093
 MD5 3721b81198a029319546e6ef56e5c493 files/smbusers 202
 MD5 ba636412fdffb621dcd28e79fb247d7c files/swat.xinetd 525
 MD5 ce5400ed75143be061711d2c1d51a081 files/system-auth-winbind 867
 MD5 cac4662bb25a75115b40c9558de26f26 files/winbind-init 503
+MD5 9560b7e29d3a65db029fc1800e84abcc files/samba-pdb_ldap-exop.patch 3921
+MD5 00dd502e04f67e67fbb6164b6b4669c7 files/digest-samba-3.0.0 135
+MD5 9ad118eb4f2d3eff69927ab1ab1913be files/digest-samba-3.0.0-r1 202
+MD5 b39fdb68b4b97d739e296edd1798c67f files/smb.conf.example-samba3 20707
+MD5 516ca38dfc67b7cd7356f93ad2cf75b9 files/samba-3.0.0-python-setup.patch 767
+MD5 60e527174c1b2c53126dbbedb3cae0f7 files/samba-2.2.8-statfs.patch 209
diff --git a/net-fs/samba/files/digest-samba-2.2.8 b/net-fs/samba/files/digest-samba-2.2.8
deleted file mode 100644
index 0cc0c35b96d3..000000000000
--- a/net-fs/samba/files/digest-samba-2.2.8
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 a1399b9e297f51bd18cb21339a3f8f67 samba-vscan-0.3.2.tar.bz2 68127
-MD5 f11004debeb8a34fd269d06ff08ac926 samba-2.2.8.tar.bz2 4504858
diff --git a/net-fs/samba/files/digest-samba-3.0.0_rc4 b/net-fs/samba/files/digest-samba-3.0.0_rc4
deleted file mode 100644
index c7384b18f6d8..000000000000
--- a/net-fs/samba/files/digest-samba-3.0.0_rc4
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 c64bf6d64a157eb51a50a969be456e32 samba-3.0.0rc4.tar.bz2 9736599
-MD5 acbcb28cff080dcf2ee732b7f2c0f949 samba-vscan-0.3.4.tar.bz2 131027
diff --git a/net-fs/samba/samba-2.2.8.ebuild b/net-fs/samba/samba-2.2.8.ebuild
deleted file mode 100644
index 72b88d0c81ce..000000000000
--- a/net-fs/samba/samba-2.2.8.ebuild
+++ /dev/null
@@ -1,390 +0,0 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-fs/samba/samba-2.2.8.ebuild,v 1.4 2003/04/07 12:01:36 gmsoft Exp $
-
-inherit eutils
-
-IUSE="pam acl cups ldap ssl tcpd"
-IUSE="${IUSE} oav"
-
-VSCAN_VER=0.3.2
-VSCAN_MODS=${VSCAN_MODS:=fprot mks openantivirus sophos trend icap} #kapersky
-# To build the "kapersky" plugin, the kapersky lib must be installed.
-
-DESCRIPTION="SAMBA is a suite of SMB and CIFS client/server programs for UNIX"
-HOMEPAGE="http://www.samba.org"
-
-S=${WORKDIR}/${P}
-SRC_URI="oav? mirror://sourceforge/openantivirus/${PN}-vscan-${VSCAN_VER}.tar.bz2
-	mirror://samba/${P}.tar.bz2"
-DEPEND="pam? >=sys-libs/pam-0.72
-	acl? sys-apps/acl
-	cups? net-print/cups
-	ldap? =net-nds/openldap-2*
-	ssl? >=dev-libs/openssl-0.9.6
-	tcpd? >=sys-apps/tcp-wrappers-7.6
-	oav? >=dev-libs/popt-1.6.3"
-KEYWORDS="x86 ppc sparc alpha hppa"
-LICENSE="GPL-2"
-SLOT="0"
-
-src_unpack() {
-	local i
-	unpack ${A} || die
-	cd ${S} || die
-
-	epatch ${FILESDIR}/samba-2.2.5-gp-reloc-fix.patch
-
-	if use portldap; then
-		cd ${S}/source
-		epatch $FILESDIR/nonroot-bind.diff
-	fi
-
-	if use ldap; then
-		cd ${S}
-		epatch ${FILESDIR}/samba-2.2.6-libresolv.patch
-	fi
-
-	# fix kerberos include file collision..
-	# --still an issue? :/
-	cd ${S}/source/include
-	mv profile.h smbprofile.h
-	sed -e "s:profile\.h:smbprofile.h:" includes.h > includes.h.new
-	mv includes.h.new includes.h
-
-	# for clean docs packaging sake, make a copy..
-	cp -a ${S}/examples ${S}/examples.bin
-	# prep the samba-vscan source
-	use oav && \
-	cp -a ${WORKDIR}/${PN}-vscan-${VSCAN_VER} ${S}/examples.bin/VFS
-
-	cd ${S}/source
-	autoconf || die
-}
-
-src_compile() {
-	local i myconf
-	use acl && myconf="--with-acl-support" \
-		||  myconf="--without-acl-support"
-
-	use ssl && myconf="${myconf} --with-ssl" \
-		|| myconf="${myconf} --without-ssl"
-
-	use pam && myconf="${myconf} --with-pam --with-pam_smbpass" \
-		|| myconf="${myconf} --without-pam --without-pam_smbpass"
-
-	use cups && myconf="${myconf} --enable-cups" \
-		|| myconf="${myconf} --disable-cups"
-
-	use ldap && myconf="${myconf} --with-ldapsam --with-winbind-ldap-hack" \
-		|| myconf="${myconf} --without-ldapsam"
-
-	cd ${S}/source
-	./configure \
-		--prefix=/usr \
-		--bindir=/usr/sbin \
-		--libdir=/etc/samba \
-		--sbindir=/usr/sbin \
-		--sysconfdir=/etc/samba \
-		--localstatedir=/var/log \
-		--with-configdir=/etc/samba \
-		--with-mandir=/usr/share/man \
-		--with-piddir=/var/run/samba \
-		--with-swatdir=/usr/share/swat \
-		--with-lockdir=/var/cache/samba \
-		--with-privatedir=/etc/samba/private \
-		--with-codepagedir=/var/lib/samba/codepages \
-		--with-winbind-auth-challenge \
-		--with-sendfile-support \
-		--without-smbwrapper \
-		--without-sambabook \
-		--without-automount \
-		--without-spinlocks \
-		--with-libsmbclient \
-		--with-netatalk \
-		--with-smbmount \
-		--with-profile \
-		--with-quotas \
-		--with-syslog \
-		--with-msdfs \
-		--with-utmp \
-		--with-vfs \
-		--host=${CHOST} ${myconf} || die "bad ./configure"
-
-	# compile samba..
-	make all smbfilter smbcacls \
-		nsswitch nsswitch/libnss_wins.so debug2html
-	assert "samba compile problem"
-	if use pam; then
-		make pam_smbpass || die "pam_smbpass compile problem"
-	fi
-
-	# compile the bundled vfs modules..
-	cd ${S}/examples.bin/VFS
-	./configure \
-		--prefix=/usr \
-		--mandir=/usr/share/man || die "bad ./configure"
-	make || die "VFS modules compile problem"
-
-	# compile the selected antivirus vfs plugins..
-	if use oav; then
-		for i in ${VSCAN_MODS}
-		do
-			cd ${S}/examples.bin/VFS/${PN}-vscan-${VSCAN_VER}/$i
-			make USE_INCLMKSDLIB=1 #needed for the mks build
-			assert "problem building $i vscan module"
-		done
-	fi
-
-	# compile mkntpasswd in examples/LDAP/ for smbldaptools..
-	if use ldap; then
-		cd ${S}/examples.bin/LDAP/smbldap-tools/mkntpwd
-		VISUAL="" make || die "mkntpwd compile problem"
-	fi
-}
-
-src_install() {
-	local i
-
-	# we may as well do this all manually since it was starting
-	# to get out of control and samba _does_ have some rather
-	# silly installation quirks ;)  much of this was adapted
-	# from mandrake's .spec file.. // woodchip - 5 May 2002
-
-	# install standard binary files..
-	for i in nmblookup smbclient smbpasswd smbstatus testparm testprns \
-		make_smbcodepage make_unicodemap make_printerdef rpcclient \
-		smbspool smbcacls smbclient smbmount smbumount wbinfo
-		#smbsh (broke)
-	do
-		exeinto /usr/bin
-		doexe source/bin/${i}
-	done
-	# make users lives easier..
-	fperms 4755 /usr/bin/smbumount
-
-
-	# secure binary files..
-	for i in smbd nmbd swat smbfilter debug2html smbmnt smbcontrol winbindd
-	do
-		exeinto /usr/sbin
-		doexe source/bin/${i}
-	done
-	# make users lives easier..
-	fperms 4755 /usr/sbin/smbmnt
-
-
-	# some utility scripts..
-	for i in mksmbpasswd.sh smbtar convert_smbpasswd
-	do
-		exeinto /usr/bin
-		doexe source/script/${i}
-	done
-	# and this handy one..
-	doexe packaging/Mandrake/findsmb
-
-
-	# utilities from LDAP/smbldap-tools
-	if use ldap; then
-		exeinto /usr/share/samba/smbldap-tools
-		doexe examples/LDAP/smbldap-tools/*.pl
-		doexe examples/LDAP/smbldap-tools/smbldap_tools.pm
-		doexe examples/LDAP/{import,export}_smbpasswd.pl
-		chmod 0700 ${D}/usr/share/samba/smbldap-tools/{import,export}_smbpasswd.pl
-		exeinto /usr/sbin
-		doexe examples.bin/LDAP/smbldap-tools/mkntpwd/mkntpwd
-		#dodir /usr/lib/perl5/site_perl/5.6.1
-		eval `perl '-V:installarchlib'`
-		dodir ${installarchlib}
-		dosym /etc/samba/smbldap_conf.pm ${installarchlib}
-		dosym /usr/share/samba/smbldap-tools/smbldap_tools.pm ${installarchlib}
-	fi
-
-
-	# libraries..
-	exeinto /usr/lib
-	#broke
-	#doexe source/bin/smbwrapper.so
-	doexe source/bin/libsmbclient.so
-	insinto /usr/lib
-	doins source/bin/libsmbclient.a
-	insinto /usr/include
-	doins source/include/libsmbclient.h
-	exeinto /lib/security
-	doexe source/nsswitch/pam_winbind.so
-	use pam && doexe source/bin/pam_smbpass.so
-
-
-	# nsswitch library extension files..
-	for i in wins winbind
-	do
-		exeinto /lib
-		doexe source/nsswitch/libnss_${i}.so
-	done
-	# make link for wins and winbind resolvers..
-	( cd ${D}/lib ; ln -s libnss_wins.so libnss_wins.so.2 )
-	( cd ${D}/lib ; ln -s libnss_winbind.so libnss_winbind.so.2 )
-
-
-	# vfs modules..
-	exeinto /usr/lib/samba/vfs
-	doexe examples.bin/VFS/audit.so
-	doexe examples.bin/VFS/block/block.so
-	doexe examples.bin/VFS/recycle/recycle.so
-	use oav && \
-	doexe examples.bin/VFS/${PN}-vscan-${VSCAN_VER}/*/vscan-*.so
-
-
-	# codepage source files..
-	for i in 437 737 775 850 852 857 861 862 866 932 936 949 950 1125 1251
-	do
-		insinto /var/lib/samba/codepages/src
-		doins source/codepages/codepage_def.${i}
-	done
-	for i in 437 737 775 850 852 857 861 862 866 932 936 949 950 1125 1251 \
-		ISO8859-1 ISO8859-2 ISO8859-5 ISO8859-7 \
-		ISO8859-9 ISO8859-13 ISO8859-15 KOI8-R KOI8-U
-	do
-		insinto /var/lib/samba/codepages/src
-		doins source/codepages/CP${i}.TXT
-	done
-
-
-	# build codepage load files..
-	for i in 437 737 775 850 852 857 861 862 866 932 936 949 950 1125 1251
-	do
-		${D}/usr/bin/make_smbcodepage c ${i} \
-			${D}/var/lib/samba/codepages/src/codepage_def.${i} \
-			${D}/var/lib/samba/codepages/codepage.${i}
-	done
-	# build unicode load files..
-	for i in 437 737 775 850 852 857 861 862 866 932 936 949 950 1125 1251 \
-		ISO8859-1 ISO8859-2 ISO8859-5 ISO8859-7 \
-		ISO8859-9 ISO8859-13 ISO8859-15 KOI8-R KOI8-U
-	do
-		${D}/usr/bin/make_unicodemap ${i} \
-			${D}/var/lib/samba/codepages/src/CP${i}.TXT \
-			${D}/var/lib/samba/codepages/unicode_map.${i}
-	done
-	rm -rf ${D}/var/lib/samba/codepages/src
-
-
-	# install SWAT helper files..
-	for i in swat/help/*.html docs/htmldocs/*.html
-	do
-		insinto /usr/share/swat/help
-		doins ${i}
-	done
-	for i in swat/images/*.gif
-	do
-		insinto /usr/share/swat/images
-		doins ${i}
-	done
-	for i in swat/include/*.html
-	do
-		insinto /usr/share/swat/include
-		doins ${i}
-	done
-
-
-	# install the O'Reilly "Using Samba" book..
-	for i in docs/htmldocs/using_samba/*.html
-	do
-		insinto /usr/share/swat/using_samba
-		doins ${i}
-	done
-	for i in docs/htmldocs/using_samba/gifs/*.gif
-	do
-		insinto /usr/share/swat/using_samba/gifs
-		doins ${i}
-	done
-	for i in docs/htmldocs/using_samba/figs/*.gif
-	do
-		insinto /usr/share/swat/using_samba/figs
-		doins ${i}
-	done
-
-
-	# man pages..
-	doman docs/manpages/*
-
-
-	# attempt to install all the docs as easily as possible :/
-	# we don't want two copies of the book or manpages
-	rm -rf docs/htmldocs/using_samba docs/manpages
-	dodoc COPYING Manifest README Roadmap WHATSNEW.txt
-	docinto full_docs
-	cp -a docs/* ${D}/usr/share/doc/${PF}/full_docs
-	docinto examples
-	cp -a examples/* ${D}/usr/share/doc/${PF}/examples
-	prepalldocs
-	# keep this next line *after* prepalldocs!
-	dosym /usr/share/swat/using_samba /usr/share/doc/${PF}/using_samba
-	# and we should unzip the html docs..
-	gunzip ${D}/usr/share/doc/${PF}/full_docs/faq/*
-	gunzip ${D}/usr/share/doc/${PF}/full_docs/htmldocs/*
-	if use oav; then
-		docinto ${PN}-vscan-${VSCAN_VER}
-		cd ${WORKDIR}/${PN}-vscan-${VSCAN_VER}
-		dodoc AUTHORS COPYING ChangeLog FAQ INSTALL NEWS README TODO
-		dodoc */*.conf
-	fi
-
-
-	# link /usr/bin/smbmount to /sbin/mount.smbfs which allows it
-	# to work transparently with the standard 'mount' command..
-	dodir /sbin
-	dosym /usr/bin/smbmount /sbin/mount.smbfs
-
-
-	# make the smb backend symlink for cups printing support..
-	if use cups; then
-		dodir /usr/lib/cups/backend
-		dosym /usr/bin/smbspool /usr/lib/cups/backend/smb
-	fi
-
-
-	# now the config files..
-	insinto /etc
-	doins ${FILESDIR}/nsswitch.conf-winbind
-	doins ${FILESDIR}/nsswitch.conf-wins
-
-	insinto /etc/samba
-	doins ${FILESDIR}/smbusers
-	doins ${FILESDIR}/smb.conf.example
-	doins ${FILESDIR}/lmhosts
-	doins ${FILESDIR}/recycle.conf
-	if use ldap; then
-		doins ${FILESDIR}/smbldap_conf.pm
-		doins ${FILESDIR}/samba-slapd-include.conf
-	fi
-
-	insinto /etc/pam.d
-	newins ${FILESDIR}/samba.pam samba
-	doins ${FILESDIR}/system-auth-winbind
-
-	exeinto /etc/init.d
-	newexe ${FILESDIR}/samba-init samba
-	newexe ${FILESDIR}/winbind-init winbind
-
-	insinto /etc/xinetd.d
-	newins ${FILESDIR}/swat.xinetd swat
-}
-
-pkg_postinst() {
-	# touch /etc/samba/smb.conf so that people installing samba just
-	# to mount smb shares don't get annoying warnings all the time..
-	if [ ! -e ${ROOT}/etc/samba/smb.conf ] ; then
-		touch ${ROOT}/etc/samba/smb.conf
-	fi
-
-	# empty dirs..
-	install -m0700 -o root -g root -d ${ROOT}/etc/samba/private
-	install -m1777 -o root -g root -d ${ROOT}/var/spool/samba
-	install -m0755 -o root -g root -d ${ROOT}/var/log/samba
-	install -m0755 -o root -g root -d ${ROOT}/var/run/samba
-	install -m0755 -o root -g root -d ${ROOT}/var/cache/samba
-	install -m0755 -o root -g root -d ${ROOT}/var/lib/samba/{netlogon,profiles}
-	install -m0755 -o root -g root -d \
-		${ROOT}/var/lib/samba/printers/{W32X86,WIN40,W32ALPHA,W32MIPS,W32PPC}
-}
diff --git a/net-fs/samba/samba-3.0.0_rc4.ebuild b/net-fs/samba/samba-3.0.0_rc4.ebuild
deleted file mode 100644
index 949383092ec3..000000000000
--- a/net-fs/samba/samba-3.0.0_rc4.ebuild
+++ /dev/null
@@ -1,359 +0,0 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-fs/samba/samba-3.0.0_rc4.ebuild,v 1.1 2003/09/15 20:34:55 woodchip Exp $
-
-inherit eutils
-
-IUSE="kerberos mysql xml acl cups ldap pam readline python"
-IUSE="${IUSE} oav"
-
-DESCRIPTION="SAMBA is a suite of SMB and CIFS client/server programs for UNIX"
-HOMEPAGE="http://www.samba.org/
-	http://www.openantivirus.org/projects.php"
-
-VSCAN_VER=0.3.4
-VSCAN_MODS=${VSCAN_MODS:=fprot mks openantivirus sophos trend icap} #kapersky
-# To build the "kapersky" plugin, the kapersky lib must be installed.
-
-_CVS="-${PV/_/}"
-S=${WORKDIR}/${PN}${_CVS}
-
-SRC_URI="mirror://samba/rc/${PN}${_CVS}.tar.bz2
-	mirror://sourceforge/openantivirus/${PN}-vscan-${VSCAN_VER}.tar.bz2"
-#	oav? http://www.openantivirus.org/snapshots/${PN}-vscan-${VSCAN_VER}.tar.gz"
-
-DEPEND="sys-devel/autoconf dev-libs/popt
-	readline? sys-libs/readline
-	kerberos? app-crypt/mit-krb5
-	mysql? ( dev-db/mysql sys-libs/zlib )
-	xml? ( dev-libs/libxml2 sys-libs/zlib )
-	acl? sys-apps/acl
-	cups? net-print/cups
-	ldap? net-nds/openldap
-	pam? sys-libs/pam
-	python? dev-lang/python"
-
-KEYWORDS="~x86 ~ppc ~sparc"
-LICENSE="GPL-2"
-SLOT="0"
-
-src_unpack() {
-	local i
-	unpack ${A} || die
-	cd ${S} || die
-
-	# Clean up CVS
-	#find . -name .cvsignore | xargs rm -f
-	#find . -name CVS | xargs rm -rf
-
-	# Add patch(es)
-	#Next one is from eger@cc.gatech.edu :)
-	patch -p1 <${FILESDIR}/samba-3.0.0-python-setup.patch || die
-	#Fix for bug #27858
-	if [ "${ARCH}" = "sparc" ]
-	then
-		cd ${S}/source/include
-		epatch ${FILESDIR}/samba-2.2.8-statfs.patch
-	fi
-
-	# For clean docs packaging sake.
-	rm -rf ${S}/examples.bin ; cp -a ${S}/examples ${S}/examples.bin
-
-	# Prep samba-vscan source.
-	if use oav; then
-		cp -a ${WORKDIR}/${PN}-vscan-${VSCAN_VER} ${S}/examples.bin/VFS
-	fi
-
-	cd ${S}/source
-	./autogen.sh || die
-}
-
-src_compile() {
-	local i
-	local myconf
-	local mymods
-
-	#this is deprecated...
-	#mymods="nisplussam"
-	use xml && mymods="xml,${mymods}"
-	use mysql && mymods="mysql,${mymods}"
-
-	myconf="--with-expsam=${mymods}"
-
-	use acl \
-		&& myconf="${myconf} --with-acl-support" \
-		|| myconf="${myconf} --without-acl-support"
-
-	use pam \
-		&& myconf="${myconf} --with-pam --with-pam_smbpass" \
-		|| myconf="${myconf} --without-pam --without-pam_smbpass"
-
-	use cups \
-		&& myconf="${myconf} --enable-cups" \
-		|| myconf="${myconf} --disable-cups"
-
-	use ldap \
-		&& myconf="${myconf} --with-ldap" \
-		|| myconf="${myconf} --without-ldap"
-		#this is for old samba 2.x compat
-		#myconf="${myconf} --with-ldapsam" 
-		myconf="${myconf} --without-ldapsam"
-
-	use kerberos \
-		&& myconf="${myconf} --with-ads" \
-		|| myconf="${myconf} --without-ads"
-
-	use python \
-		&& myconf="${myconf} --with-python=yes" \
-		|| myconf="${myconf} --with-python=no"
-
-	use readline \
-		&& myconf="${myconf} --with-readline" \
-		|| myconf="${myconf} --without-readline"
-
-	einfo "\$myconf is: $myconf"
-
-	#default_{static,shared}_modules|source/configure
-	#/usr/lib/samba/auth/.............      AUTH_MODULES
-	#/usr/lib/samba/charset/                CHARSET_MODULES
-	#/usr/lib/samba/pdb/..............      PDB_MODULES
-	#/usr/lib/samba/rpc/                    RPC_MODULES
-	#/usr/lib/samba/vfs/..............      VFS_MODULES|source/Makefile
-	#/usr/lib/samba/lowcase.dat
-	#/usr/lib/samba/upcase.dat
-	#/usr/lib/samba/valid.dat
-
-	cd source
-	./configure \
-		--prefix=/usr \
-		--sysconfdir=/etc/samba \
-		--localstatedir=/var \
-		--libdir=/usr/lib/samba \
-		--with-privatedir=/etc/samba/private \
-		--with-lockdir=/var/cache/samba \
-		--with-piddir=/var/run/samba \
-		--with-swatdir=/usr/share/swat \
-		--with-configdir=/etc/samba \
-		--with-logfilebase=/var/log/samba \
-		\
-		--enable-static --enable-shared \
-		--with-manpages-langs=en \
-		--without-spinlocks \
-		--with-libsmbclient \
-		--with-automount \
-		--with-smbmount \
-		--with-winbind \
-		--with-quotas \
-		--with-syslog \
-		--with-idmap \
-		--host=${CHOST} ${myconf} || die
-
-	# Compile main SAMBA pieces.
-	make everything || die "SAMBA pieces"
-	#make rpctorture
-
-	# Build selected samba-vscan plugins.
-	if use oav; then
-		cd ${S}/examples.bin/VFS/${PN}-vscan-${VSCAN_VER}
-		./configure || die "bad ${PN}-vscan-${VSCAN_VER} ./configure"
-		for i in ${VSCAN_MODS}
-		do
-			cd ${S}/examples.bin/VFS/${PN}-vscan-${VSCAN_VER}/$i
-			make USE_INCLMKSDLIB=1 #needed for the mks build
-			assert "problem building $i vscan module"
-		done
-	fi
-}
-
-src_install() {
-# For testing brokeness of make install
-#	cd source
-#	make DESTDIR=${D} install installmodules install_python
-#	assert "It would be nice if that worked. REALLY worked."
-
-	# Install standard binary files.
-	for i in smbclient net smbspool testparm testprns smbstatus \
-		smbcontrol smbtree tdbbackup nmblookup pdbedit \
-		smbpasswd rpcclient smbcacls profiles ntlm_auth \
-		smbcquotas smbmount smbmnt smbumount wbinfo \
-		debug2html smbfilter talloctort #smbsh editreg
-	do
-		exeinto /usr/bin
-		doexe source/bin/${i}
-	done
-	doexe source/script/{smbtar,findsmb}
-
-	# TORTURE_PROGS / Testing stuff, if they built they will come.
-	for i in smbtorture msgtest masktest locktest locktest2 \
-		nsstest vfstest rpctorture
-	do
-		if [ -x source/bin/${i} ]
-		then
-			exeinto /usr/bin
-			doexe source/bin/${i}
-		fi
-	done
-
-	# Installing these two setuid-root allows users to (un)mount smbfs.
-	fperms 4111 /usr/bin/smbumount
-	fperms 4111 /usr/bin/smbmnt
-
-	# Install server binaries.
-	for i in smbd nmbd swat winbindd # wrepld
-	do
-		exeinto /usr/sbin
-		doexe source/bin/${i}
-	done
-
-	# Libraries.
-	exeinto /usr/lib
-	#broken for a while now with some wacky glibc issue
-	#doexe source/bin/smbwrapper.so
-	doexe source/bin/libsmbclient.so
-	insinto /usr/lib
-	doins source/bin/libsmbclient.a
-	insinto /usr/include
-	doins source/include/libsmbclient.h
-	exeinto /lib/security
-	doexe source/nsswitch/pam_winbind.so
-	use pam && doexe source/bin/pam_smbpass.so
-
-	# Nsswitch extensions.
-	for i in wins winbind
-	do
-		exeinto /lib
-		doexe source/nsswitch/libnss_${i}.so
-	done
-	# make link for wins and winbind resolvers..
-	( cd ${D}/lib ; ln -s libnss_wins.so libnss_wins.so.2 )
-	( cd ${D}/lib ; ln -s libnss_winbind.so libnss_winbind.so.2 )
-
-	# Python extensions.
-	if use python; then
-		cd source
-		python python/setup.py install --root=${D} || die
-		cd ..
-	fi
-
-	# VFS plugin modules.
-	exeinto /usr/lib/samba/vfs
-	use oav && doexe examples.bin/VFS/${PN}-vscan-${VSCAN_VER}/*/vscan-*.so
-	for i in audit extd_audit fake_perms netatalk recycle
-	do
-		if [ -x source/bin/${i}.so ]
-		then
-			doexe source/bin/${i}.so
-		fi
-	done
-
-	# Passdb modules.
-	exeinto /usr/lib/samba/pdb
-	use mysql && doexe source/bin/mysql.so
-	use xml && doexe source/bin/xml.so
-
-	# Install codepage data files.
-	insinto /usr/lib/samba
-	doins source/codepages/*.dat
-
-	# Install SWAT helper files.
-	for i in swat/help/*.html docs/htmldocs/*.html
-	do
-		insinto /usr/share/swat/help
-		doins ${i}
-	done
-	for i in swat/images/*.gif
-	do
-		insinto /usr/share/swat/images
-		doins ${i}
-	done
-	for i in swat/include/*.html
-	do
-		insinto /usr/share/swat/include
-		doins ${i}
-	done
-
-	# Install man pages.
-	doman docs/manpages/*
-
-	# SAMBA has a lot of docs, so this just basically
-	# installs them all!  We don't want two copies of
-	# the book or manpages though, so:
-	rm -rf docs/htmldocs/using_samba docs/manpages
-
-	dodoc COPYING Manifest README Roadmap WHATSNEW.txt
-	docinto full_docs
-	cp -a docs/* ${D}/usr/share/doc/${PF}/full_docs
-	docinto examples
-	cp -a examples/* ${D}/usr/share/doc/${PF}/examples
-	prepalldocs
-	# and we should unzip the html docs..
-	gunzip ${D}/usr/share/doc/${PF}/full_docs/faq/*
-	gunzip ${D}/usr/share/doc/${PF}/full_docs/htmldocs/*
-	if use oav; then
-		docinto ${PN}-vscan-${VSCAN_VER}
-		cd ${WORKDIR}/${PN}-vscan-${VSCAN_VER}
-		dodoc AUTHORS COPYING ChangeLog FAQ INSTALL NEWS README TODO
-		dodoc */*.conf
-		cd ${S}
-	fi
-	chown -R root.root ${D}/usr/share/doc/${PF}
-
-	# link /usr/bin/smbmount to /sbin/mount.smbfs which allows it
-	# to work transparently with the standard 'mount' command..
-	dodir /sbin
-	dosym /usr/bin/smbmount /sbin/mount.smbfs
-
-	# make the smb backend symlink for cups printing support..
-	if use cups; then
-		dodir /usr/lib/cups/backend
-		dosym /usr/bin/smbspool /usr/lib/cups/backend/smb
-	fi
-
-	# Now the config files.
-	if use ldap; then
-		insinto /etc/openldap/schema
-		doins examples/LDAP/samba.schema
-	fi
-
-	insinto /etc
-	dodoc ${FILESDIR}/nsswitch.conf-winbind
-	doins ${FILESDIR}/nsswitch.conf-wins
-
-	insinto /etc/samba
-	doins ${FILESDIR}/smbusers
-
-	# need to update this one!!
-	doins ${FILESDIR}/smb.conf.example
-	doins ${FILESDIR}/lmhosts
-	doins ${FILESDIR}/recycle.conf
-
-	insinto /etc/pam.d
-	newins ${FILESDIR}/samba.pam samba
-	doins ${FILESDIR}/system-auth-winbind
-
-	exeinto /etc/init.d
-	newexe ${FILESDIR}/samba-init samba
-	# hmmm
-	newexe ${FILESDIR}/winbind-init winbind
-
-	insinto /etc/xinetd.d
-	newins ${FILESDIR}/swat.xinetd swat
-}
-
-pkg_postinst() {
-	# touch /etc/samba/smb.conf so that people installing samba just
-	# to mount smb shares don't get annoying warnings all the time..
-	if [ ! -e ${ROOT}/etc/samba/smb.conf ] ; then
-		touch ${ROOT}/etc/samba/smb.conf
-	fi
-
-	# empty dirs..
-	install -m0700 -o root -g root -d ${ROOT}/etc/samba/private
-	install -m1777 -o root -g root -d ${ROOT}/var/spool/samba
-	install -m0755 -o root -g root -d ${ROOT}/var/log/samba
-	install -m0755 -o root -g root -d ${ROOT}/var/run/samba
-	install -m0755 -o root -g root -d ${ROOT}/var/cache/samba
-	install -m0755 -o root -g root -d ${ROOT}/var/lib/samba/{netlogon,profiles}
-	install -m0755 -o root -g root -d \
-		${ROOT}/var/lib/samba/printers/{W32X86,WIN40,W32ALPHA,W32MIPS,W32PPC}
-}