version bump (bug #80807) and old conf file preservation fix (bug #80293)

(Portage version: 2.0.51-r15)

5 files changed, 459 insertions, 47 deletions

diff --git a/net-fs/samba/ChangeLog b/net-fs/samba/ChangeLog
index 010e383cbd08..e08ff987f182 100644
--- a/net-fs/samba/ChangeLog
+++ b/net-fs/samba/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-fs/samba
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-fs/samba/ChangeLog,v 1.148 2005/01/25 21:11:02 gmsoft Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-fs/samba/ChangeLog,v 1.149 2005/02/05 12:58:13 satya Exp $
+
+*samba-3.0.11 (05 Feb 2005)
+
+  05 Feb 2005; Christian Andreetta <satya@gentoo.org> samba-3.0.10.ebuild,
+  +samba-3.0.11.ebuild:
+  version bump (bug #80807) and old conf file preservation fix (bug #80293)
 
   25 Jan 2005; Guy Martin <gmsoft@gentoo.org> samba-3.0.10.ebuild:
   Stable on hppa.
diff --git a/net-fs/samba/Manifest b/net-fs/samba/Manifest
index c562e8522dc9..a6011e39414c 100644
--- a/net-fs/samba/Manifest
+++ b/net-fs/samba/Manifest
@@ -1,56 +1,58 @@
+MD5 998e5fa677027d5f9c34c6e11a2f2300 samba-3.0.7.ebuild 13959
+MD5 752029d2b65f2faafedafcbc8f74c0cb samba-3.0.7-r1.ebuild 15430
+MD5 a099bbaec41e1bf990ab5b7986ce4cf1 samba-3.0.6-r4.ebuild 14235
+MD5 083d413f283087c796ad3a7f6eb25d13 samba-3.0.11.ebuild 16393
+MD5 0f3d8c9bb836841be55e78eadd0ea0b7 samba-3.0.9.ebuild 16226
+MD5 636cefb79b33da2114659a179850f094 samba-3.0.6-r3.ebuild 14258
+MD5 7b437485608a9d4133c07e606ab9fda8 samba-3.0.9-r1.ebuild 16411
+MD5 39d0ab3118f58930c7158f3afff623c8 samba-3.0.10.ebuild 16388
+MD5 8df69d51a4a13d38c421f32cbf82d2a6 samba-3.0.8.ebuild 16847
 MD5 879c55f4e67e24a0e2f05fbb9d847e1d ChangeLog 26361
 MD5 41299f246433a1a55c8fccc77ccd709e metadata.xml 491
-MD5 3fa6feccd4fa682c526e75010845fa44 samba-3.0.10.ebuild 16358
-MD5 636cefb79b33da2114659a179850f094 samba-3.0.6-r3.ebuild 14258
-MD5 a099bbaec41e1bf990ab5b7986ce4cf1 samba-3.0.6-r4.ebuild 14235
-MD5 752029d2b65f2faafedafcbc8f74c0cb samba-3.0.7-r1.ebuild 15430
-MD5 998e5fa677027d5f9c34c6e11a2f2300 samba-3.0.7.ebuild 13959
 MD5 e561c6780260096813f060bcbd96b61f samba-3.0.8-r1.ebuild 17161
-MD5 8df69d51a4a13d38c421f32cbf82d2a6 samba-3.0.8.ebuild 16847
-MD5 7b437485608a9d4133c07e606ab9fda8 samba-3.0.9-r1.ebuild 16411
-MD5 0f3d8c9bb836841be55e78eadd0ea0b7 samba-3.0.9.ebuild 16226
-MD5 fd2382184b6a07e63cb07ff26b578fd2 files/config-svc-smbd+nmbd 784
+MD5 fcebd975211fecf647f6cecf26ba5c96 files/samba-3.0.4.patch 8086
 MD5 fa1dcd2c95a81c22c2ad68de6698a85e files/digest-samba-3.0.10 206
-MD5 8c114eb3ebe56e7adb7db9381bea62db files/digest-samba-3.0.6-r3 203
-MD5 8c114eb3ebe56e7adb7db9381bea62db files/digest-samba-3.0.6-r4 203
-MD5 a6cb7ea67d2a4fa00cb2d5dba0710cc3 files/digest-samba-3.0.7 203
-MD5 a6cb7ea67d2a4fa00cb2d5dba0710cc3 files/digest-samba-3.0.7-r1 203
-MD5 66e68bb6d3ceb275479b3c68e7becf9d files/digest-samba-3.0.8 203
-MD5 94d8eb813ea041a79ee00914c5052b3f files/digest-samba-3.0.8-r1 205
-MD5 afb788b7b2370ba7045b8d7d7ba8b11a files/digest-samba-3.0.9 205
-MD5 5933e87f1c72bc7a29a1ea4073b49441 files/digest-samba-3.0.9-r1 284
-MD5 519576a9448b86f1a7baab18204533a5 files/lmhosts 126
+MD5 5cb8bfa14396777d6e3b69975cf7e181 files/digest-samba-3.0.11 204
+MD5 e89b19f1e62e257cbaa23a44a0362a58 files/swat.xinetd 527
+MD5 a7cc90ba23d86b1d90f65645826dde19 files/smbldap_conf.pm 7095
+MD5 cbaa5a39d9bd67b13f8131b426a4256b files/samba-2.2.5-gp-reloc-fix.patch 431
+MD5 e17a1638ad9f30f2e39db4c8981a2fcd files/vscan-0.3.5-libclamav.patch 523
+MD5 7ee5edc70bf80888c776f5808f865996 files/nsswitch.conf-wins 392
+MD5 341521b710d02d57a70acd49b1d4c06b files/samba-conf 1291
+MD5 f1bd70937bb822e70fcd5a81efba02d2 files/samba-init 1090
+MD5 b836e258befae9d6c66cb3f158769b25 files/samba-3.0.x-libdirsymlink.patch 592
+MD5 fd2382184b6a07e63cb07ff26b578fd2 files/config-svc-smbd+nmbd 784
+MD5 e5dbea6345ee39a97bc8783f5772bf49 files/samba-3.0.6-winbind_getpwnam_v1.patch 2521
 MD5 f402c2c4103f4c13ac3cc5fa165940db files/nonroot-bind.diff 757
 MD5 5d3129a0f6bcbec6ec91d217881a34e1 files/nsswitch.conf-winbind 298
-MD5 7ee5edc70bf80888c776f5808f865996 files/nsswitch.conf-wins 392
-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 519576a9448b86f1a7baab18204533a5 files/lmhosts 126
 MD5 516ca38dfc67b7cd7356f93ad2cf75b9 files/samba-3.0.0-python-setup.patch 767
-MD5 990fe15ff8a0e79f39069fff6475536d files/samba-3.0.2a-smbprint.patch 1224
-MD5 de43ff30dd5f1431590fd62a997e71b4 files/samba-3.0.4-python-setup.patch 833
-MD5 fcebd975211fecf647f6cecf26ba5c96 files/samba-3.0.4.patch 8086
-MD5 579303048a39e504238ff8e658413452 files/samba-3.0.6-homes-reuse_v2.patch 2411
-MD5 b836e258befae9d6c66cb3f158769b25 files/samba-3.0.6-libdirsymlink.patch 592
-MD5 bf268fdddc8ef677b6fa78661a094eac files/samba-3.0.6-samba.schema 16044
-MD5 e5dbea6345ee39a97bc8783f5772bf49 files/samba-3.0.6-winbind_getpwnam_v1.patch 2521
-MD5 4b541de7c65bbbb129d2522d821b4609 files/samba-3.0.8-lanman.patch 472
-MD5 48bea6e2bb73a2b7ce286bedefae3011 files/samba-3.0.9-util.c-bitpmap.c-4120.patch 1872
-MD5 b836e258befae9d6c66cb3f158769b25 files/samba-3.0.x-libdirsymlink.patch 592
 MD5 e75c2316eced1d80cb2161848581c6a3 files/samba-3.0.x-python-setup.patch 1094
-MD5 8ea7b443dd580aaaaf7e9e896eba54f2 files/samba-3.0.x-smbumount-uid32.patch 425
-MD5 fcebd975211fecf647f6cecf26ba5c96 files/samba-3.0.x.patch 8086
-MD5 341521b710d02d57a70acd49b1d4c06b files/samba-conf 1291
-MD5 f1bd70937bb822e70fcd5a81efba02d2 files/samba-init 1090
-MD5 9560b7e29d3a65db029fc1800e84abcc files/samba-pdb_ldap-exop.patch 3921
+MD5 1eec486ab39a239e25a76b16a6fcd460 files/smb.conf.example 16183
 MD5 6b6683448cdc01d013bd2c61b4ed8e1e files/samba-slapd-include.conf 499
-MD5 6acf6a5e92ff2cfc5f09b88f5d01b63e files/samba-svc 975
-MD5 b6cdc1468e45f92f19873e0c6c5b6e94 files/samba.pam 332
+MD5 60e527174c1b2c53126dbbedb3cae0f7 files/samba-2.2.8-statfs.patch 209
+MD5 a6cb7ea67d2a4fa00cb2d5dba0710cc3 files/digest-samba-3.0.7 203
+MD5 66e68bb6d3ceb275479b3c68e7becf9d files/digest-samba-3.0.8 203
+MD5 afb788b7b2370ba7045b8d7d7ba8b11a files/digest-samba-3.0.9 205
+MD5 8ea7b443dd580aaaaf7e9e896eba54f2 files/samba-3.0.x-smbumount-uid32.patch 425
 MD5 bf268fdddc8ef677b6fa78661a094eac files/samba.schema 16044
-MD5 1eec486ab39a239e25a76b16a6fcd460 files/smb.conf.example 16183
 MD5 239ef0e21552896faeef21c685561245 files/smb.conf.example-samba3.gz 7808
-MD5 a7cc90ba23d86b1d90f65645826dde19 files/smbldap_conf.pm 7095
+MD5 bf268fdddc8ef677b6fa78661a094eac files/samba-3.0.6-samba.schema 16044
+MD5 8c114eb3ebe56e7adb7db9381bea62db files/digest-samba-3.0.6-r3 203
+MD5 8c114eb3ebe56e7adb7db9381bea62db files/digest-samba-3.0.6-r4 203
+MD5 a6cb7ea67d2a4fa00cb2d5dba0710cc3 files/digest-samba-3.0.7-r1 203
+MD5 94d8eb813ea041a79ee00914c5052b3f files/digest-samba-3.0.8-r1 205
+MD5 5933e87f1c72bc7a29a1ea4073b49441 files/digest-samba-3.0.9-r1 284
+MD5 9560b7e29d3a65db029fc1800e84abcc files/samba-pdb_ldap-exop.patch 3921
 MD5 3685eadb817d185b06476eca6c0c15c4 files/smbusers 204
-MD5 e89b19f1e62e257cbaa23a44a0362a58 files/swat.xinetd 527
 MD5 09195dd8ab25ce77ac51c0c05b4ab93c files/system-auth-winbind 869
-MD5 e17a1638ad9f30f2e39db4c8981a2fcd files/vscan-0.3.5-libclamav.patch 523
+MD5 4b541de7c65bbbb129d2522d821b4609 files/samba-3.0.8-lanman.patch 472
+MD5 579303048a39e504238ff8e658413452 files/samba-3.0.6-homes-reuse_v2.patch 2411
+MD5 990fe15ff8a0e79f39069fff6475536d files/samba-3.0.2a-smbprint.patch 1224
+MD5 b836e258befae9d6c66cb3f158769b25 files/samba-3.0.6-libdirsymlink.patch 592
+MD5 6acf6a5e92ff2cfc5f09b88f5d01b63e files/samba-svc 975
+MD5 b6cdc1468e45f92f19873e0c6c5b6e94 files/samba.pam 332
+MD5 48bea6e2bb73a2b7ce286bedefae3011 files/samba-3.0.9-util.c-bitpmap.c-4120.patch 1872
+MD5 de43ff30dd5f1431590fd62a997e71b4 files/samba-3.0.4-python-setup.patch 833
+MD5 fcebd975211fecf647f6cecf26ba5c96 files/samba-3.0.x.patch 8086
+MD5 8289eda694b35875eec6df5cc3f50c86 files/samba-2.2.6-libresolv.patch 540
diff --git a/net-fs/samba/files/digest-samba-3.0.11 b/net-fs/samba/files/digest-samba-3.0.11
new file mode 100644
index 000000000000..a77876eb06da
--- /dev/null
+++ b/net-fs/samba/files/digest-samba-3.0.11
@@ -0,0 +1,3 @@
+MD5 217e489646a474b4fb69d5802c14bc6e samba-3.0.11.tar.gz 15372539
+MD5 5f173d549014985d681478897135915b samba-vscan-0.3.5.tar.bz2 161982
+MD5 ce266c508c7628b4ff382933a4f25b46 smbldap-tools-0.8.6.tgz 277464
diff --git a/net-fs/samba/samba-3.0.10.ebuild b/net-fs/samba/samba-3.0.10.ebuild
index 9ac01e12a8d7..aa7969cf9a30 100644
--- a/net-fs/samba/samba-3.0.10.ebuild
+++ b/net-fs/samba/samba-3.0.10.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-fs/samba/samba-3.0.10.ebuild,v 1.10 2005/01/25 21:11:02 gmsoft Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-fs/samba/samba-3.0.10.ebuild,v 1.11 2005/02/05 12:58:13 satya Exp $
 
 inherit eutils flag-o-matic
 #---------------------------------------------------------------------------
@@ -13,7 +13,7 @@ HOMEPAGE="http://www.samba.org/
 	http://www.openantivirus.org/projects.php
 	http://samba.idealx.org"
 #---------------------------------------------------------------------------
-SMBLDAP_TOOLS_VER=0.8.5
+SMBLDAP_TOOLS_VER=0.8.5-3
 VSCAN_VER=0.3.5
 # all vscan modules are being installed
 #VSCAN_MODS="oav sophos fprotd fsav trend icap mksd kavp clamav nai" 
@@ -23,7 +23,7 @@ S=${WORKDIR}/${PN}${_CVS}
 #---------------------------------------------------------------------------
 SRC_URI="mirror://samba/${PN}${_CVS}.tar.gz
 	oav? ( mirror://sourceforge/openantivirus/${PN}-vscan-${VSCAN_VER}.tar.bz2 )
-	ldap? ( http://samba.idealx.org/dist/smbldap-tools-${SMBLDAP_TOOLS_VER}-3.tgz )"
+	ldap? ( http://samba.idealx.org/dist/smbldap-tools-${SMBLDAP_TOOLS_VER}.tgz )"
 #---------------------------------------------------------------------------
 _COMMON_DEPS="dev-libs/popt
 	readline? ( sys-libs/readline )
@@ -61,6 +61,7 @@ pkg_setup() {
 	local PRIVATE_SRC=/etc/samba/private
 	if [[ ! -r ${PRIVATEDIR}/secrets.tdb && -r ${PRIVATE_SRC}/secrets.tdb ]]; then
 		einfo "Copying ${PRIVATE_SRC}/* to ${PRIVATEDIR}/"
+		mkdir -p ${D}${PRIVATEDIR}/
 		cp -af ${PRIVATE_SRC}/* ${D}${PRIVATEDIR}/
 	fi
 }
diff --git a/net-fs/samba/samba-3.0.11.ebuild b/net-fs/samba/samba-3.0.11.ebuild
new file mode 100644
index 000000000000..4a140bd01842
--- /dev/null
+++ b/net-fs/samba/samba-3.0.11.ebuild
@@ -0,0 +1,400 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-fs/samba/samba-3.0.11.ebuild,v 1.1 2005/02/05 12:58:13 satya Exp $
+
+inherit eutils flag-o-matic
+#---------------------------------------------------------------------------
+IUSE="acl cups doc kerberos ldap mysql pam postgres python quotas readline winbind xml xml2"
+IUSE="${IUSE} libclamav oav"
+IUSE="${IUSE} selinux"
+#---------------------------------------------------------------------------
+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
+	http://samba.idealx.org"
+#---------------------------------------------------------------------------
+SMBLDAP_TOOLS_VER=0.8.6
+VSCAN_VER=0.3.5
+# all vscan modules are being installed
+#VSCAN_MODS="oav sophos fprotd fsav trend icap mksd kavp clamav nai" 
+#---------------------------------------------------------------------------
+_CVS="-${PV/_/}"
+S=${WORKDIR}/${PN}${_CVS}
+#---------------------------------------------------------------------------
+SRC_URI="mirror://samba/${PN}${_CVS}.tar.gz
+	oav? ( mirror://sourceforge/openantivirus/${PN}-vscan-${VSCAN_VER}.tar.bz2 )
+	ldap? ( http://samba.idealx.org/dist/smbldap-tools-${SMBLDAP_TOOLS_VER}.tgz )"
+#---------------------------------------------------------------------------
+_COMMON_DEPS="dev-libs/popt
+	readline? ( sys-libs/readline )
+	ldap? ( kerberos? ( virtual/krb5 ) )
+	mysql? ( dev-db/mysql sys-libs/zlib )
+	postgres? ( dev-db/postgresql sys-libs/zlib )
+	xml? ( dev-libs/libxml2 sys-libs/zlib )
+	xml2? ( dev-libs/libxml2 sys-libs/zlib )
+	acl? ( sys-apps/acl )
+	cups? ( net-print/cups )
+	ldap? ( net-nds/openldap dev-perl/Crypt-SmbHash )
+	pam? ( sys-libs/pam )
+	python? ( dev-lang/python )"
+DEPEND="sys-devel/autoconf
+	>=sys-apps/sed-4
+	${_COMMON_DEPS}"
+#IDEALX scripts are now using Net::LDAP
+#selinux: bug #62907
+RDEPEND="ldap? ( dev-perl/perl-ldap ) ${_COMMON_DEPS}
+	selinux? ( sec-policy/selinux-samba )"
+#---------------------------------------------------------------------------
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
+#===========================================================================
+pkg_setup() {
+	ewarn "2004-11: new ebuild flags:"
+	ewarn "    quotas:    now disabled by default"
+	ewarn "    winbind:   now disabled by default"
+	ewarn "    libclamav: (oav) don't use clamav daemon, just load libraries when needed"
+	ewarn "/etc/samba/private moved to /var/lib/samba/private"
+	ebeep
+	epause
+	local PRIVATEDIR=/var/lib/samba/private
+	local PRIVATE_SRC=/etc/samba/private
+	if [[ ! -r ${PRIVATEDIR}/secrets.tdb && -r ${PRIVATE_SRC}/secrets.tdb ]]; then
+		einfo "Copying ${PRIVATE_SRC}/* to ${PRIVATEDIR}/"
+		mkdir -p ${D}${PRIVATEDIR}/
+		cp -af ${PRIVATE_SRC}/* ${D}${PRIVATEDIR}/
+	fi
+}
+#===========================================================================
+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) --------------------------------------------------------
+	epatch ${FILESDIR}/samba-3.0.x-python-setup.patch || die
+	#bug #44743 ------------------------------------------------------------
+	if [ ${ARCH} = "amd64" -o ${ARCH} = "ppc" -o ${ARCH} = "ppc64" ]; then
+		cd ${S} && epatch ${FILESDIR}/samba-3.0.x-smbumount-uid32.patch
+	fi
+	#Fix for bug #27858 ----------------------------------------------------
+	if [ ${ARCH} = "sparc" -o ${ARCH} = "ppc" -o ${ARCH} = "ppc64" ]; then
+		cd ${S}/source/include && epatch ${FILESDIR}/samba-2.2.8-statfs.patch
+	fi
+	#Bug #36200; sys-kernel/linux-headers dependent ------------------------
+	sed -i -e 's:#define LINUX_QUOTAS_2:#define LINUX_QUOTAS_1:' \
+		-e 's:<linux/quota.h>:<sys/quota.h>:' \
+		${S}/source/smbd/quotas.c
+	#amd64 lib location is not lib32 nor lib -------------------------------
+	cd ${S} || die
+	use amd64 && epatch ${FILESDIR}/samba-3.0.x-libdirsymlink.patch
+	# examples: to be copied as docs ---------------------------------------
+	rm -rf ${S}/examples.ORIG
+	cp -a ${S}/examples ${S}/examples.ORIG
+	# Prep samba-vscan source.
+	if use oav ; then
+		cd ${WORKDIR}/${PN}-vscan-${VSCAN_VER}
+		epatch ${FILESDIR}/vscan-${VSCAN_VER}-libclamav.patch
+		cp -a ${WORKDIR}/${PN}-vscan-${VSCAN_VER} ${S}/examples/VFS
+	fi
+	#-----------------------------------------------------------------------
+	cd ${S}/source
+	echo "Running autoconf ..."
+	autoconf || die
+}
+#===========================================================================
+my_configure() {
+	local myconf="$1"
+	#-----------------------------------------------------------------------
+	for info_var in myconf CFLAGS LDFLAGS; do
+		einfo "${info_var} is: ${!info_var}"
+	done
+	#-----------------------------------------------------------------------
+	#default_{static,shared}_modules|source/configure
+	cd ${S}/source
+	econf \
+		--prefix=/usr \
+		--libdir=/usr/lib/samba \
+		--with-libdir=/usr/lib/samba \
+		--with-swatdir=/usr/share/doc/${PF}/swat \
+		--localstatedir=/var \
+		--with-piddir=/var/run/samba \
+		--with-lockdir=/var/cache/samba \
+		--with-logfilebase=/var/log/samba \
+		--sysconfdir=/etc/samba \
+		--with-configdir=/etc/samba \
+		--with-privatedir=/var/lib/samba/private \
+		\
+		--enable-static \
+		--enable-shared \
+		--with-manpages-langs=en \
+		--without-spinlocks \
+		--with-libsmbclient \
+		--with-automount \
+		--with-smbmount \
+		--with-syslog \
+		--with-idmap \
+		--host=${CHOST} \
+		${myconf} || die
+	# Show install dirs ----------------------------------------------------
+	einfo "Dir conf:"
+	emake showlayout
+	# serialized headers make ----------------------------------------------
+	make proto
+}
+#===========================================================================
+src_compile() {
+	local myconf
+	local mymods
+	#mymods="nisplussam" #this is deprecated...
+	#-----------------------------------------------------------------------
+	use xml || use xml2 && mymods="xml,${mymods}"
+	use mysql && mymods="mysql,${mymods}"
+	use postgres && mymods="pgsql,${mymods}"
+	[ -n "${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 quotas \
+		&& myconf="${myconf} --with-quotas --with-sys-quotas" \
+		|| myconf="${myconf} --without-quotas --without-sys-quotas"
+	use winbind \
+		&& myconf="${myconf} --with-winbind" \
+		|| myconf="${myconf} --without-winbind"
+	use python \
+		&& myconf="${myconf} --with-python=yes" \
+		|| myconf="${myconf} --with-python=no"
+	use readline \
+		&& myconf="${myconf} --with-readline" \
+		|| myconf="${myconf} --without-readline"
+	#-----------------------------------------------------------------------
+	# Removing: bug #64815 states that ads in amd64 is now ok
+	###if [ "${ARCH}" != "amd64" ]; then
+	###	use kerberos && use ldap \
+	###		&& myconf="${myconf} --with-ads" \
+	###		|| myconf="${myconf} --without-ads"
+	###else
+	###	myconf="${myconf} --without-ads"
+	###fi
+	use kerberos && use ldap \
+		&& myconf="${myconf} --with-ads" \
+		|| myconf="${myconf} --without-ads"
+	#-----------------------------------------------------------------------
+	append-ldflags -L/usr/$(get_libdir) # lib64 location
+	append-ldflags -Wl,-z,now # lib preload
+	# SUID configure -------------------------------------------------------
+	my_configure "${myconf}"
+	# SUID compile ---------------------------------------------------------
+	for file in smbmnt smbumount; do
+		einfo "LD: BIND_NOW: bin/${file}"
+		rm -f bin/${file}
+		emake bin/${file} || die "LD: BIND_NOW: bin/${file} compile error"
+	done
+	for file in mount.cifs; do
+		einfo "LD: BIND_NOW: bin/${file}"
+		gcc ${CFLAGS} ${LDFLAGS} client/${file}.c -o bin/${file} || die "LD: BIND_NOW: bin/${file} compile error"
+	done
+	# CONFIGURE ------------------------------------------------------------
+	LDFLAGS=${LDFLAGS/-Wl,-z,now/} #lib preload change must affect suid only!
+	my_configure "${myconf}"
+	# Compile main SAMBA pieces --------------------------------------------
+	einfo "make everything" && emake everything || die "SAMBA make everything error"
+	einfo "make rpctorture" && emake rpctorture || ewarn "rpctorture didn't build"
+	# build smbget ---------------------------------------------------------
+	einfo "smbget"
+	emake bin/smbget; assert "smbget compile error"
+	# Build selected samba-vscan plugins -----------------------------------
+	if use oav; then
+		cd ${S}/examples/VFS/${PN}-vscan-${VSCAN_VER}
+		my_conf="--prefix=/usr --libdir=/usr/lib/samba"
+		use libclamav && my_conf="${my_conf} --with-libclamav"
+		./configure ${my_conf}
+		assert "bad ${PN}-vscan-${VSCAN_VER} ./configure"
+		emake # ${VSCAN_MODS}
+	fi
+}
+#===========================================================================
+src_install() {
+	local i #for cicles
+	local extra_bins="debug2html smbfilter talloctort mount.cifs smbget"
+	#smbsh editreg
+	extra_bins="${extra_bins} smbtorture msgtest masktest locktest \
+		locktest2 nsstest vfstest rpctorture"
+	# ----------------------------------------------------------------------
+	cd ${S}/source
+	make DESTDIR=${D} install-everything
+	# Extra binary files, testing/torture progs ----------------------------
+	exeinto /usr/bin
+	for i in ${extra_bins}; do
+		[ -x ${S}/source/bin/${i} ] && doexe ${S}/source/bin/${i} && \
+		einfo "Extra binaries: ${i}"
+	done
+	# Installing these setuid-root allows users to (un)mount smbfs/cifs ----
+	for i in /usr/bin/smbumount /usr/bin/smbmnt /usr/bin/mount.cifs; do
+		fperms 4111 ${i} || die "No perms: ${i}"
+		einfo "suid: ${i}"
+	done
+	# Nsswitch extensions. Make link for wins and winbind resolvers --------
+	exeinto /lib
+	doexe ${S}/source/nsswitch/libnss_wins.so
+	( cd ${D}/lib; ln -s libnss_wins.so libnss_wins.so.2 )
+	if use winbind; then
+		doexe ${S}/source/nsswitch/libnss_winbind.so
+		( cd ${D}/lib; ln -s libnss_winbind.so libnss_winbind.so.2 )
+		exeinto /lib/security && doexe ${S}/source/nsswitch/pam_winbind.so
+	fi
+	exeinto /lib/security
+	use pam && doexe ${S}/source/bin/pam_smbpass.so
+	# mount backend --------------------------------------------------------
+	dodir /sbin
+	dosym ../usr/bin/smbmount /sbin/mount.smbfs
+	dosym ../usr/bin/mount.cifs /sbin/mount.cifs
+	# bug #46389: samba doesn't create symlink anymore
+	# beaviour seems to be changed in 3.0.6, see bug #61046 
+	dosym /usr/lib/samba/libsmbclient.so /usr/lib/libsmbclient.so.0
+	dosym /usr/lib/samba/libsmbclient.so /usr/lib/libsmbclient.so
+	# 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
+	# Install IDEALX scripts for LDAP backend administration ---------------
+	if use ldap; then
+		# corrections as per bug #41796
+		cd ${WORKDIR}/smbldap-tools-${SMBLDAP_TOOLS_VER}
+		exeinto /usr/share/samba/scripts; doexe smbldap-*
+		exeinto /etc/samba ; doexe smbldap_tools.pm
+		insinto /etc/smbldap-tools ; doins *.conf
+		fperms 644 /etc/smbldap-tools/smbldap.conf
+		fperms 600 /etc/smbldap-tools/smbldap_bind.conf
+		eval `perl '-V:installarchlib'`
+		dodir ${installarchlib}
+		#dosym /etc/samba/smbldap_conf.pm ${installarchlib}
+		#dosym /etc/samba/smbldap_conf.pm /usr/share/samba/scripts
+		dosym /etc/samba/smbldap_tools.pm ${installarchlib}
+		dosym /etc/samba/smbldap_tools.pm /usr/share/samba/scripts
+		if [ -f mkntpwd/mkntpwd ]; then
+			exeinto /usr/sbin ; doexe mkntpwd/mkntpwd
+		fi
+	fi
+	# VFS plugin modules ---------------------------------------------------
+	if use oav; then
+		#exeinto /usr/lib/samba/vfs
+		#doexe ${S}/examples/VFS/${PN}-vscan-${VSCAN_VER}/vscan-*.so
+		cd ${S}/examples/VFS/${PN}-vscan-${VSCAN_VER}
+		make install DESTDIR=${D} || die "VFS: vscan error"
+		insinto /etc/samba
+		doins ${S}/examples/VFS/${PN}-vscan-${VSCAN_VER}/openantivirus/*conf
+	fi
+	# Python extensions ----------------------------------------------------
+	if use python; then
+		cd ${S}/source
+		python python/setup.py install --root=${D} || die
+	fi
+	# General config files -------------------------------------------------
+	insinto /etc/samba
+	touch ${D}/etc/samba/smb.conf
+	doins ${FILESDIR}/smbusers
+	newins ${FILESDIR}/smb.conf.example-samba3.gz smb.conf.example.gz
+	doins ${FILESDIR}/lmhosts
+	#doins ${FILESDIR}/recycle.conf #obsolete: see bug #68315
+	insinto /etc/pam.d
+	newins ${FILESDIR}/samba.pam samba
+	use winbind && doins ${FILESDIR}/system-auth-winbind
+	insinto /etc/xinetd.d
+	newins ${FILESDIR}/swat.xinetd swat
+	exeinto /etc/init.d; newexe ${FILESDIR}/samba-init samba
+	insinto /etc/conf.d; newins ${FILESDIR}/samba-conf samba
+	if use ldap; then
+		insinto /etc/openldap/schema
+		doins ${S}/examples/LDAP/samba.schema
+	fi
+	# dirs -----------------------------------------------------------------
+	diropts -m0700
+	local PRIVATE_DST=/var/lib/samba/private
+	dodir ${PRIVATE_DST}
+	touch ${D}${PRIVATE_DST}/.keep
+	diropts -m1777
+	dodir /var/spool/samba
+	touch ${D}/var/spool/samba/.keep
+	diropts -m0755
+	dodir /var/{log,run,cache}/samba
+	dodir /var/lib/samba/{netlogon,profiles}
+	dodir /var/lib/samba/printers/{W32X86,WIN40,W32ALPHA,W32MIPS,W32PPC}
+	touch ${D}/var/{log,run,cache}/samba/.keep
+	touch ${D}/var/lib/samba/{netlogon,profiles}/.keep
+	touch ${D}/var/lib/samba/printers/{W32X86,WIN40,W32ALPHA,W32MIPS,W32PPC}/.keep
+	# docs -----------------------------------------------------------------
+	docinto ""
+	dodoc ${S}/COPYING ${S}/Manifest ${S}/README ${S}/Roadmap ${S}/WHATSNEW.txt
+	docinto examples
+	dodoc ${FILESDIR}/nsswitch.conf-wins
+	use winbind && dodoc ${FILESDIR}/nsswitch.conf-winbind
+	cp -a ${S}/examples.ORIG/* ${D}/usr/share/doc/${PF}/examples
+	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
+	if use ldap; then
+		docinto smbldap-tools-${SMBLDAP_TOOLS_VER}
+		cd ${WORKDIR}/smbldap-tools-${SMBLDAP_TOOLS_VER}
+		dodoc CONTRIBUTORS COPYING ChangeLog FILES INFRA INSTALL README TODO
+	fi
+	if ! use doc; then
+		rm -rf ${D}/usr/share/doc/${PF}/swat/help/{guide,howto,devel}
+		rm -rf ${D}/usr/share/doc/${PF}/swat/using_samba
+	fi
+	# moving manpages ------------------------------------------------------
+	mv ${D}/usr/man ${D}/usr/share/man
+}
+#===========================================================================
+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..
+	#[ ! -e ${ROOT}/etc/samba/smb.conf ] && touch ${ROOT}/etc/samba/smb.conf
+
+	ewarn ""
+	ewarn "If you are upgrading from a Samba version prior to 3.0.2, and you"
+	ewarn "use Samba's password database, you must run the following command:"
+	ewarn ""
+	ewarn "  pdbedit --force-initialized-passwords"
+	ewarn ""
+	ewarn "2004-09: LIBs flags changes for suid bins: LDFLAGS+='-Wl,-z,now'"
+	if use winbind; then
+		ewarn "         3.0.7: param: 'winbind enable local accounts' is now"
+		ewarn "                       disabled by default"
+	fi
+	ewarn "2004-11: /etc/samba/private moved to /var/lib/samba/private "
+	ewarn "            for better File System Hierarchy adeherence"
+	ewarn ""
+	einfo "If you experience client locks in file transfers _only_, try the parameter"
+	einfo "         use sendfile = no (man smb.conf(5), man sendfile(2))"
+	einfo "There also seem some problems with the smbfs implementation of the recent 2.6.x kernels"
+	einfo "If you experience problems (lockups) with smbfs, try cifs as an alternative"
+	einfo ""
+	if use ldap; then
+		ewarn "If you are upgrading from prior to 3.0.2, and you are using LDAP"
+		ewarn "    for Samba authentication, you must check the sambaPwdLastSet"
+		ewarn "    attribute on all accounts, and ensure it is not 0."
+		einfo ""
+	fi
+	einfo "There is a good HOWTO about setting up samba3 with cups and clamav at"
+	einfo "http://www.gentoo.org/doc/en/quick-samba-howto.xml"
+}
+