Initial commit. New split samba ebuilds by dev-zero.

Package-Manager: portage-2.2_rc33/cvs/Linux x86_64

12 files changed, 703 insertions, 2 deletions

diff --git a/net-fs/samba-client/ChangeLog b/net-fs/samba-client/ChangeLog
new file mode 100644
index 000000000000..2416dc93200c
--- /dev/null
+++ b/net-fs/samba-client/ChangeLog
@@ -0,0 +1,11 @@
+# ChangeLog for net-fs/samba-client
+# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-fs/samba-client/ChangeLog,v 1.1 2009/06/26 20:22:56 patrick Exp $
+
+*samba-client-3.3.6 (26 Jun 2009)
+
+  26 Jun 2009; Patrick Lauer <patrick@gentoo.org>
+  +files/3.3.3-fix-as-needed.patch, +files/3.3.4-missing_includes.patch,
+  +samba-client-3.3.6.ebuild, +metadata.xml:
+  Initial commit. New split samba ebuilds by dev-zero.
+
diff --git a/net-fs/samba-client/files/3.3.3-fix-as-needed.patch b/net-fs/samba-client/files/3.3.3-fix-as-needed.patch
new file mode 100644
index 000000000000..7dc2359571f4
--- /dev/null
+++ b/net-fs/samba-client/files/3.3.3-fix-as-needed.patch
@@ -0,0 +1,14 @@
+--- source/Makefile.in.orig	2009-04-08 16:45:35.000000000 +0200
++++ source/Makefile.in	2009-04-08 16:45:46.000000000 +0200
+@@ -1389,9 +1389,9 @@
+ bin/cifs.upcall@EXEEXT@: $(BINARY_PREREQS) $(CIFS_UPCALL_OBJ) $(LIBSMBCLIENT_OBJ1) @BUILD_POPT@ @LIBTALLOC_SHARED@ @LIBTDB_SHARED@ @LIBWBCLIENT_SHARED@
+ 	@echo Linking $@
+ 	@$(CC) $(FLAGS) -o $@ $(CIFS_UPCALL_OBJ) $(DYNEXP) $(LDFLAGS) \
+-		-lkeyutils $(LIBS) $(LIBSMBCLIENT_OBJ1) $(KRB5LIBS) \
++		-lkeyutils $(LIBSMBCLIENT_OBJ1) $(KRB5LIBS) \
+ 		$(LDAP_LIBS) $(POPT_LIBS) $(LIBTALLOC_LIBS) $(WINBIND_LIBS) \
+-		$(LIBTDB_LIBS) $(NSCD_LIBS)
++		$(LIBTDB_LIBS) $(NSCD_LIBS) $(LIBS)
+ 
+ bin/testparm@EXEEXT@: $(BINARY_PREREQS) $(TESTPARM_OBJ) @BUILD_POPT@ @LIBTALLOC_SHARED@ @LIBTDB_SHARED@
+ 	@echo Linking $@
diff --git a/net-fs/samba-client/files/3.3.4-missing_includes.patch b/net-fs/samba-client/files/3.3.4-missing_includes.patch
new file mode 100644
index 000000000000..722c6f8c0437
--- /dev/null
+++ b/net-fs/samba-client/files/3.3.4-missing_includes.patch
@@ -0,0 +1,10 @@
+--- source/client/mtab.c.orig	2009-03-23 09:33:48.339895132 +0100
++++ source/client/mtab.c	2009-03-23 09:33:58.159797512 +0100
+@@ -32,6 +32,7 @@
+ #include <errno.h>
+ #include <stdio.h>
+ #include <sys/time.h>
++#include <sys/stat.h>
+ #include <time.h>
+ #include <fcntl.h>
+ #include <mntent.h>
diff --git a/net-fs/samba-client/metadata.xml b/net-fs/samba-client/metadata.xml
new file mode 100644
index 000000000000..b858ca25116c
--- /dev/null
+++ b/net-fs/samba-client/metadata.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>samba</herd>
+<maintainer>
+	<email>samba@gentoo.org</email>
+	<name>Samba Team</name>
+</maintainer>
+<longdescription>
+Samba is an Open Source/Free Software suite that provides seamless file and print services to SMB/CIFS clients. Integration with various accounting and antivirus backends. License: GNU General Public License.
+</longdescription>
+<use>
+	<flag name="ads">Enable Active Directory support</flag>
+	<flag name="aio">Enable asynchronous IO support</flag>
+	<flag name="cluster">Enable support for clustering</flag>
+	<flag name="winbind">Enables support for the winbind auth daemon</flag>
+</use>
+</pkgmetadata>
diff --git a/net-fs/samba-client/samba-client-3.3.6.ebuild b/net-fs/samba-client/samba-client-3.3.6.ebuild
new file mode 100644
index 000000000000..03f1fe7559dd
--- /dev/null
+++ b/net-fs/samba-client/samba-client-3.3.6.ebuild
@@ -0,0 +1,196 @@
+# Copyright 1999-2009 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.3.6.ebuild,v 1.1 2009/06/26 20:22:56 patrick Exp $
+
+EAPI="2"
+
+inherit pam confutils versionator multilib eutils toolchain-funcs
+
+MY_P="samba-${PV}"
+
+DESCRIPTION="Libraries from Samba"
+HOMEPAGE="http://www.samba.org/"
+SRC_URI="mirror://samba/${MY_P}.tar.gz"
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="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 )
+		ldap? ( net-nds/openldap )
+		syslog? ( virtual/logger )
+		net-fs/samba-libs[caps?,cups?,ldap?,syslog?,winbind?]
+	)"
+RDEPEND="${DEPEND}"
+
+S="${WORKDIR}/${MY_P}/source"
+
+# 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 ads ldap
+}
+
+src_prepare() {
+	epatch \
+		"${FILESDIR}/3.3.4-missing_includes.patch" \
+		"${FILESDIR}/3.3.3-fix-as-needed.patch"
+
+	sed -i \
+		-e 's|"lib32" ||' \
+		-e 's|if test -d "$i/$l" ;|if test -d "$i/$l" -o -L "$i/$l";|' \
+		configure || die "sed failed"
+
+	sed -i \
+		-e 's|@LIBTALLOC_SHARED@||g' \
+		-e 's|@LIBTDB_SHARED@||g' \
+		-e 's|@LIBWBCLIENT_SHARED@||g' \
+		-e 's|@LIBNETAPI_SHARED@||g' \
+		-e 's|$(REG_SMBCONF_OBJ) @LIBNETAPI_STATIC@ $(LIBNET_OBJ)|$(REG_SMBCONF_OBJ) @LIBNETAPI_LIBS@ $(LIBNET_OBJ)|' \
+		Makefile.in || die "sed failed"
+
+	# Upstream doesn't want us to link certain things dynamically, but those binaries here seem to work
+	sed -i \
+		-e '/^LINK_LIBNETAPI/d' \
+		configure || die "sed failed"
+}
+
+src_configure() {
+	local myconf
+
+	# 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 \
+			--with-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
+
+	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
+	dohtml ../docs/htmldocs/manpages/{u,}mount.cifs.8.html
+
+	into /usr
+	if use ads ; then
+		dosbin bin/cifs.upcall || die "cifs.upcall not around"
+		doman ../docs/manpages/cifs.upcall.8
+		doman ../docs/htmldocs/cifs.upcall.8.html
+	fi
+
+	if ! use minimal ; then
+		dobin ${BINPROGS} || die "not all bins around"
+		for prog in ${BINPROGS} ; do
+			doman ../docs/manpages/${prog/bin\/}*
+			dohtml ../docs/htmldocs/${prog/bin\/}*.html
+		done
+
+		if use cups ; then
+			dobin bin/smbspool || die "smbspool not around"
+			doman ../docs/manpages/smbspool.8
+			dohtml ../docs/htmldocs/smbspool.8.html
+			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
new file mode 100644
index 000000000000..5e442ebb7c6c
--- /dev/null
+++ b/net-fs/samba-libs/ChangeLog
@@ -0,0 +1,12 @@
+# ChangeLog for net-fs/samba-libs
+# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-fs/samba-libs/ChangeLog,v 1.1 2009/06/26 20:19:44 patrick Exp $
+
+*samba-libs-3.3.6 (26 Jun 2009)
+
+  26 Jun 2009; Patrick Lauer <patrick@gentoo.org>
+  +files/3.3/nsswitch.conf-winbind, +files/3.3/nsswitch.conf-wins,
+  +files/3.3/samba.pam, +files/3.3/system-auth-winbind.pam,
+  +samba-libs-3.3.6.ebuild, +metadata.xml:
+  Initial commit. New split samba ebuilds by dev-zero.
+
diff --git a/net-fs/samba-libs/metadata.xml b/net-fs/samba-libs/metadata.xml
new file mode 100644
index 000000000000..b858ca25116c
--- /dev/null
+++ b/net-fs/samba-libs/metadata.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>samba</herd>
+<maintainer>
+	<email>samba@gentoo.org</email>
+	<name>Samba Team</name>
+</maintainer>
+<longdescription>
+Samba is an Open Source/Free Software suite that provides seamless file and print services to SMB/CIFS clients. Integration with various accounting and antivirus backends. License: GNU General Public License.
+</longdescription>
+<use>
+	<flag name="ads">Enable Active Directory support</flag>
+	<flag name="aio">Enable asynchronous IO support</flag>
+	<flag name="cluster">Enable support for clustering</flag>
+	<flag name="winbind">Enables support for the winbind auth daemon</flag>
+</use>
+</pkgmetadata>
diff --git a/net-fs/samba-libs/samba-libs-3.3.6.ebuild b/net-fs/samba-libs/samba-libs-3.3.6.ebuild
new file mode 100644
index 000000000000..51d3fc9880b4
--- /dev/null
+++ b/net-fs/samba-libs/samba-libs-3.3.6.ebuild
@@ -0,0 +1,174 @@
+# Copyright 1999-2009 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.3.6.ebuild,v 1.1 2009/06/26 20:19:44 patrick Exp $
+
+EAPI="2"
+
+inherit pam confutils versionator multilib
+
+MY_P="samba-${PV}"
+
+DESCRIPTION="Libraries from Samba"
+HOMEPAGE="http://www.samba.org/"
+SRC_URI="mirror://samba/${MY_P}.tar.gz"
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="ads aio caps cluster cups debug examples ldap pam syslog winbind"
+
+DEPEND="dev-libs/popt
+	virtual/libiconv
+	ads? ( virtual/krb5 sys-fs/e2fsprogs )
+	caps? ( sys-libs/libcap )
+	cluster? ( dev-db/ctdb )
+	cups? ( net-print/cups )
+	ldap? ( net-nds/openldap )
+	pam? ( virtual/pam
+		winbind? ( dev-libs/iniparser ) )
+	syslog? ( virtual/logger )
+	!<net-fs/samba-3.3"
+RDEPEND="${DEPEND}"
+
+# Disable tests since we don't want to build that much here
+RESTRICT="test"
+
+S="${WORKDIR}/${MY_P}/source"
+
+# 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 ads ldap
+}
+
+src_prepare() {
+	sed -i \
+		-e 's|"lib32" ||' \
+		-e 's|if test -d "$i/$l" ;|if test -d "$i/$l" -o -L "$i/$l";|' \
+		configure || die "sed failed"
+}
+
+src_configure() {
+	local myconf
+
+	# 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 \
+		--with-lib{talloc,tdb,netapi,smbclient,smbsharemodes} \
+		--without-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() {
+	emake libs pam_modules nss_modules || die "emake failed"
+}
+
+src_install() {
+	emake DESTDIR="${D}" installlibs || die "emake installlibs failed"
+	if use pam ; then
+		emake DESTDIR="${D}" installpammodules || 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
+		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.7
+			dohtml ../docs/htmldocs/manpages/pam_winbind.7.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
+
+	if use examples ; then
+		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
new file mode 100644
index 000000000000..777e33fd18f7
--- /dev/null
+++ b/net-fs/samba-server/ChangeLog
@@ -0,0 +1,12 @@
+# ChangeLog for net-fs/samba-server
+# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-fs/samba-server/ChangeLog,v 1.1 2009/06/26 20:23:31 patrick Exp $
+
+*samba-server-3.3.6 (26 Jun 2009)
+
+  26 Jun 2009; Patrick Lauer <patrick@gentoo.org> +files/3.3/lmhosts,
+  +files/3.3/samba.confd, +files/3.3/samba.initd,
+  +files/3.3/smb.conf.default, +files/3.3/smbusers, +files/3.3/swat.xinetd,
+  +samba-server-3.3.6.ebuild, +metadata.xml:
+  Initial commit. New split samba ebuilds by dev-zero.
+
diff --git a/net-fs/samba-server/metadata.xml b/net-fs/samba-server/metadata.xml
new file mode 100644
index 000000000000..ede5c6c065a4
--- /dev/null
+++ b/net-fs/samba-server/metadata.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>samba</herd>
+<maintainer>
+	<email>samba@gentoo.org</email>
+	<name>Samba Team</name>
+</maintainer>
+<longdescription>
+Samba is an Open Source/Free Software suite that provides seamless file and print services to SMB/CIFS clients. Integration with various accounting and antivirus backends. License: GNU General Public License.
+</longdescription>
+<use>
+	<flag name="ads">Enable Active Directory support</flag>
+	<flag name="aio">Enable asynchronous IO support</flag>
+	<flag name="cluster">Enable support for clustering</flag>
+	<flag name="quota">Enables support for user quotas</flag>
+	<flag name="swat">Enables support for swat configuration gui</flag>
+	<flag name="winbind">Enables support for the winbind auth daemon</flag>
+</use>
+</pkgmetadata>
diff --git a/net-fs/samba-server/samba-server-3.3.6.ebuild b/net-fs/samba-server/samba-server-3.3.6.ebuild
new file mode 100644
index 000000000000..928a522baab6
--- /dev/null
+++ b/net-fs/samba-server/samba-server-3.3.6.ebuild
@@ -0,0 +1,215 @@
+# Copyright 1999-2009 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.3.6.ebuild,v 1.1 2009/06/26 20:23:31 patrick Exp $
+
+EAPI="2"
+
+inherit pam confutils versionator multilib
+
+MY_P="samba-${PV}"
+
+DESCRIPTION="Libraries from Samba"
+HOMEPAGE="http://www.samba.org/"
+SRC_URI="mirror://samba/${MY_P}.tar.gz"
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="acl ads aio avahi caps cluster cups debug doc examples fam ldap quota swat syslog winbind zeroconf"
+
+# currently a bit broken
+RESTRICT="test"
+
+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 )
+	ldap? ( net-nds/openldap )
+	syslog? ( virtual/logger )
+	net-fs/samba-libs[caps?,cluster?,cups?,ldap?,syslog?,winbind?]"
+RDEPEND="${DEPEND}"
+
+S="${WORKDIR}/${MY_P}/source"
+
+# TODO:
+# - enable iPrint on Prefix/OSX and Darwin?
+# - selftest-prefix? selftest?
+
+CONFDIR="${FILESDIR}/$(get_version_component_range 1-2)"
+SBINPROGS="bin/smbd bin/nmbd"
+BINPROGS="bin/testparm bin/smbstatus bin/smbcontrol bin/tdbbackup bin/pdbedit
+	bin/tdbdump bin/tdbtool bin/profiles bin/sharesec
+	bin/eventlogadm bin/ldbedit bin/ldbsearch bin/ldbadd bin/ldbdel bin/ldbmodify bin/ldbrename"
+
+pkg_setup() {
+	confutils_use_depend_all ads ldap
+}
+
+src_prepare() {
+	sed -i \
+		-e 's|"lib32" ||' \
+		-e 's|if test -d "$i/$l" ;|if test -d "$i/$l" -o -L "$i/$l";|' \
+		configure || die "sed failed"
+
+	sed -i \
+		-e 's|@LIBTALLOC_SHARED@||g' \
+		-e 's|@LIBTDB_SHARED@||g' \
+		-e 's|@LIBWBCLIENT_SHARED@||g' \
+		-e 's|@LIBNETAPI_SHARED@||g' \
+		-e 's|$(REG_SMBCONF_OBJ) @LIBNETAPI_STATIC@ $(LIBNET_OBJ)|$(REG_SMBCONF_OBJ) @LIBNETAPI_LIBS@ $(LIBNET_OBJ)|' \
+		Makefile.in || die "sed failed"
+
+	# Upstream doesn't want us to link certain things dynamically, but those binaries here seem to work
+	sed -i \
+		-e '/^LINK_LIBNETAPI/d' \
+		configure || die "sed failed"
+}
+
+src_configure() {
+	local myconf
+
+	# 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 \
+		--without-pam \
+		--without-pam_smbpass \
+		$(use_with syslog) \
+		$(use_with quota quotas) \
+		$(use_with quota sys-quotas) \
+		--without-utmp \
+		--with-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
+	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/Manifest b/net-fs/samba/Manifest
index a390cdd49a67..206a69950479 100644
--- a/net-fs/samba/Manifest
+++ b/net-fs/samba/Manifest
@@ -40,5 +40,6 @@ EBUILD samba-3.0.35.ebuild 10114 RMD160 142f18ec729d107e7048ab4cdc6329c92f8fdffe
 EBUILD samba-3.2.11.ebuild 8291 RMD160 894aff8b443c73ab65c6a0bdbb9a602907c771af SHA1 292a791031267868a08b486cff05bca58ac70a8b SHA256 d85019e0b7dea53f78f0075aac0112d146a0b283e4f4b16ba6181e2db7a09ba2
 EBUILD samba-3.2.13-r1.ebuild 8434 RMD160 79050ac1cf7aadcaf1199f8a0ea3acd63d5eb49d SHA1 26c993d3110488673d860b61258093067032cb97 SHA256 d3c14633f429115274bed0ea2ae6e262ed9a71ac88e3b7ce596192a87ff89a22
 EBUILD samba-3.2.13.ebuild 8289 RMD160 e46b181d7bfe407bba6c130e454a3e96dd17a916 SHA1 4cab6c1b57c3d07b54dffed8bf4e51a1a5045442 SHA256 c4d549b826b06f74219cfe9ead564f0d02230b3ca9997bb1527706c7d819b387
-MISC ChangeLog 60986 RMD160 a63fd6be5afabe12d700cad55c3000a5ce2209d2 SHA1 ad9581fbbfc8ecc1504b575da0ee83d34b80862e SHA256 0820a75f6cdf0bc7c53e01c990f9483a1db6400285c8a9972059c5ade725984e
-MISC metadata.xml 950 RMD160 4947143536f9776d7dd7f7d6552d624e1f2ac14d SHA1 ef8a8c0c5cd229c88b1f93042ebfbdafaf45deb2 SHA256 b040a13821dbd3f1214b96ed5a808188ef0996161b0ce0cc11de8d8397de960f
+EBUILD samba-3.3.6.ebuild 513 RMD160 0296dd282a9293eb0d45005db8d6b5e1a4571149 SHA1 eb15639ff0e58b69dc6de90011b71732f5e965be SHA256 04ecb07302c468b3a8f0b47ee1d1526c8942f2e64f6e2d8b5d3050b4bf15d2f5
+MISC ChangeLog 61169 RMD160 76345736f9ae8866aa8d1e2b6acbde38a7a5ea69 SHA1 d8500de1a1b3e4b8062c57a76ad6600ba23f587b SHA256 56cd288a0a8af71867142a02de1fd0f5f1d7d014a402d7090b2569c3a5d37e45
+MISC metadata.xml 1069 RMD160 eb0321b9638db7d55c7e828dad1dd91bbc28f7b0 SHA1 77dd8e895f72250f3e78e110355b879ed536ac72 SHA256 762e9f02f67ae34dbc0bfaf8856541b0b0f1d2f282cd81ef51b7eeba1919331a