Fixed cups dependency in samba-3.5.15.ebuild (bug #451026). Added latest 3.5 version. Adjusted SRC_URI so source packages can still be found when they got superseded by newer versions. Removed obsolete version. Removed unused USE flag description from metadata.xml file

(Portage version: 2.2.0_alpha149/cvs/Linux x86_64, signed Manifest commit with key 0x981CA6FC)

8 files changed, 480 insertions, 175 deletions

diff --git a/net-fs/samba/ChangeLog b/net-fs/samba/ChangeLog
index 7cd90bb66613..947ae2e827d8 100644
--- a/net-fs/samba/ChangeLog
+++ b/net-fs/samba/ChangeLog
@@ -1,6 +1,16 @@
 # ChangeLog for net-fs/samba
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-fs/samba/ChangeLog,v 1.550 2013/01/01 09:03:08 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-fs/samba/ChangeLog,v 1.551 2013/01/09 11:42:30 polynomial-c Exp $
+
+*samba-3.5.20 (09 Jan 2013)
+
+  09 Jan 2013; Lars Wendler <polynomial-c@gentoo.org> samba-3.5.15.ebuild,
+  +samba-3.5.20.ebuild, samba-3.6.9.ebuild, samba-3.6.10.ebuild,
+  -samba-4.0.0_rc5.ebuild, samba-4.0.0.ebuild, metadata.xml:
+  Non-maintainer commit: Fixed cups dependency in samba-3.5.15.ebuild (bug
+  #451026). Added latest 3.5 version. Adjusted SRC_URI so source packages can
+  still be found when they got superseded by newer versions. Removed obsolete
+  version. Removed unused USE flag description from metadata.xml file.
 
   01 Jan 2013; Agostino Sarubbo <ago@gentoo.org> samba-3.6.10.ebuild:
   Add ~ia64, wrt bug #444688
diff --git a/net-fs/samba/metadata.xml b/net-fs/samba/metadata.xml
index 07b196a36e14..d0c82d3de21f 100644
--- a/net-fs/samba/metadata.xml
+++ b/net-fs/samba/metadata.xml
@@ -25,7 +25,6 @@ Samba is an Open Source/Free Software suite that provides seamless file and prin
 	<flag name="smbclient">Enable smbclient tool</flag>
 	<flag name="smbsharemodes">Enable special smb share modes (?) </flag>
 	<flag name="smbtav2">Enable Samba Traffic Analyzer version 2 </flag>
-	<flag name="fulltest">Enabling extra tests in test phase </flag>
 	<flag name="iprint">Enabling iPrint technology by Novell</flag>
 </use>
 </pkgmetadata>
diff --git a/net-fs/samba/samba-3.5.15.ebuild b/net-fs/samba/samba-3.5.15.ebuild
index cc8a0b176032..999281484efb 100644
--- a/net-fs/samba/samba-3.5.15.ebuild
+++ b/net-fs/samba/samba-3.5.15.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-fs/samba/samba-3.5.15.ebuild,v 1.9 2012/10/19 08:10:00 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-fs/samba/samba-3.5.15.ebuild,v 1.10 2013/01/09 11:42:30 polynomial-c Exp $
 
 EAPI=4
 
@@ -11,7 +11,7 @@ MY_P="${PN}-${MY_PV}"
 
 DESCRIPTION="Library bits of the samba network filesystem"
 HOMEPAGE="http://www.samba.org/"
-SRC_URI="mirror://samba/${P}.tar.gz
+SRC_URI="mirror://samba/stable/${P}.tar.gz
 	http://dev.gentoo.org/~dagger/files/smb_traffic_analyzer_v2.diff.bz2"
 LICENSE="GPL-3"
 SLOT="0"
@@ -20,6 +20,7 @@ IUSE="acl addns ads +aio avahi caps +client cluster cups debug doc examples fam
 	ldap ldb +netapi pam quota +readline selinux +server +smbclient smbsharemodes smbtav2
 	swat syslog winbind"
 
+# upstream doesn't support cups 1.6 for samba 3.5
 DEPEND="dev-libs/popt
 	!net-fs/samba-client
 	!net-fs/samba-libs
@@ -35,7 +36,7 @@ DEPEND="dev-libs/popt
 	client? ( !net-fs/mount-cifs
 		dev-libs/iniparser )
 	cluster? ( >=dev-db/ctdb-1.0.114_p1 )
-	cups? ( net-print/cups )
+	cups? ( <net-print/cups-1.6 )
 	fam? ( virtual/fam )
 	ldap? ( net-nds/openldap )
 	pam? ( virtual/pam
diff --git a/net-fs/samba/samba-3.5.20.ebuild b/net-fs/samba/samba-3.5.20.ebuild
new file mode 100644
index 000000000000..2e32223e3ee9
--- /dev/null
+++ b/net-fs/samba/samba-3.5.20.ebuild
@@ -0,0 +1,456 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-fs/samba/samba-3.5.20.ebuild,v 1.1 2013/01/09 11:42:30 polynomial-c Exp $
+
+EAPI=4
+
+inherit pam versionator multilib eutils
+
+MY_PV=${PV/_/}
+MY_P="${PN}-${MY_PV}"
+
+DESCRIPTION="Library bits of the samba network filesystem"
+HOMEPAGE="http://www.samba.org/"
+SRC_URI="mirror://samba/stable/${P}.tar.gz
+	http://dev.gentoo.org/~dagger/files/smb_traffic_analyzer_v2.diff.bz2"
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
+IUSE="acl addns ads +aio avahi caps +client cluster cups debug doc examples fam
+	ldap ldb +netapi pam quota +readline selinux +server +smbclient smbsharemodes smbtav2
+	swat syslog winbind"
+
+# upstream doesn't support cups 1.6 for samba 3.5
+DEPEND="dev-libs/popt
+	!net-fs/samba-client
+	!net-fs/samba-libs
+	!net-fs/samba-server
+	!net-fs/cifs-utils
+	sys-libs/talloc
+	sys-libs/tdb
+	virtual/libiconv
+	ads? ( virtual/krb5 sys-fs/e2fsprogs
+		client? ( sys-apps/keyutils ) )
+	avahi? ( net-dns/avahi[dbus] )
+	caps? ( sys-libs/libcap )
+	client? ( !net-fs/mount-cifs
+		dev-libs/iniparser )
+	cluster? ( >=dev-db/ctdb-1.0.114_p1 )
+	cups? ( <net-print/cups-1.6 )
+	fam? ( virtual/fam )
+	ldap? ( net-nds/openldap )
+	pam? ( virtual/pam
+		winbind? ( dev-libs/iniparser )
+	)
+	readline? ( >=sys-libs/readline-5.2 )
+	selinux? ( sec-policy/selinux-samba )
+	syslog? ( virtual/logger )"
+
+RDEPEND="${DEPEND}"
+
+# Disable tests since we don't want to build that much here
+RESTRICT="test"
+
+SBINPROGS=""
+BINPROGS=""
+KRBPLUGIN=""
+PLUGINEXT=".so"
+SHAREDMODS=""
+
+S="${WORKDIR}/${MY_P}/source3"
+
+# TODO:
+# - enable iPrint on Prefix/OSX and Darwin?
+# - selftest-prefix? selftest?
+# - AFS?
+
+CONFDIR="${FILESDIR}/$(get_version_component_range 1-2)"
+
+REQUIRED_USE="
+	ads? ( ldap )
+	swat? ( server )
+"
+
+pkg_setup() {
+	if use server ; then
+		SBINPROGS="${SBINPROGS} bin/smbd bin/nmbd"
+		BINPROGS="${BINPROGS} bin/testparm bin/smbstatus bin/smbcontrol bin/pdbedit
+			bin/profiles bin/sharesec bin/eventlogadm"
+
+		use smbtav2 && BINPROGS="${BINPROGS} bin/smbta-util"
+		use swat && SBINPROGS="${SBINPROGS} bin/swat"
+		use winbind && SBINPROGS="${SBINPROGS} bin/winbindd"
+		use ads && use winbind && KRBPLUGIN="${KRBPLUGIN} bin/winbind_krb5_locator"
+	fi
+
+	if use client ; then
+		BINPROGS="${BINPROGS} bin/smbclient bin/net bin/smbget bin/smbtree
+			bin/nmblookup bin/smbpasswd bin/rpcclient bin/smbcacls bin/smbcquotas
+			bin/ntlm_auth"
+
+		use ads && SBINPROGS="${SBINPROGS} bin/cifs.upcall"
+	fi
+
+	use cups && BINPROGS="${BINPROGS} bin/smbspool"
+	use ldb && BINPROGS="${BINPROGS} bin/ldbedit bin/ldbsearch bin/ldbadd bin/ldbdel bin/ldbmodify bin/ldbrename";
+
+	if use winbind ; then
+		BINPROGS="${BINPROGS} bin/wbinfo"
+		SHAREDMODS="${SHAREDMODS}idmap_rid,idmap_hash"
+		use ads && SHAREDMODS="${SHAREDMODS},idmap_ad"
+		use ldap && SHAREDMODS="${SHAREDMODS},idmap_ldap,idmap_adex"
+	fi
+
+	if use winbind &&
+		[[ $(tc-getCC)$ == *gcc* ]] &&
+		[[ $(gcc-major-version)$(gcc-minor-version) -lt 43 ]]
+	then
+		eerror "It is a known issue that ${P} will not build with "
+		eerror "winbind use flag enabled when using gcc < 4.3 ."
+		eerror "Please use at least the latest stable gcc version."
+		die "Using sys-devel/gcc < 4.3 with winbind use flag."
+	fi
+}
+
+src_prepare() {
+	cp "${FILESDIR}/samba-3.4.2-lib.tevent.python.mk" "../lib/tevent/python.mk"
+
+	# ensure that winbind has correct ldflags (QA notice)
+	sed -i \
+		-e 's|LDSHFLAGS="|LDSHFLAGS="\\${LDFLAGS} |g' \
+		configure || die "sed failed"
+
+	epatch "${CONFDIR}"/${PN}-3.5.6-kerberos-dummy.patch
+	use smbtav2 && cd "${WORKDIR}/${P}" && epatch "${WORKDIR}"/smb_traffic_analyzer_v2.diff
+	cd "${WORKDIR}/${MY_P}" && epatch "${CONFDIR}"/${PN}-3.5.8-uclib-build.patch
+	epatch "${CONFDIR}"/smb.conf.default.patch
+}
+
+src_configure() {
+	local myconf
+
+	# Filter out -fPIE
+	[[ ${CHOST} == *-*bsd* ]] && 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
+
+	# use_with doesn't accept 2 USE-flags
+	if use client && use ads ; then
+		myconf+=" --with-cifsupcall"
+	else
+		myconf+=" --without-cifsupcall"
+	fi
+
+	if use client && use kernel_linux ; then
+		myconf+=" --with-cifsmount --with-cifsumount"
+	else
+		myconf+=" --without-cifsmount --without-cifsumount"
+	fi
+
+	#bug #399141 wrap newer iniparser version
+	has_version ">=dev-libs/iniparser-3.0.0" && \
+		export CPPFLAGS+=" -Diniparser_getstr\(d,i\)=iniparser_getstring\(d,i,NULL\)"
+
+	# Notes:
+	# - automount is only needed in conjunction with NIS and we don't have that
+	# anymore => LDAP?
+	# - --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 cups) \
+		--disable-iprint \
+		$(use_enable fam) \
+		--enable-shared-libs \
+		--disable-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 \
+		$(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} \
+		$(use_with netapi libnetapi) \
+		$(use_with smbclient libsmbclient) \
+		$(use_with smbsharemodes libsmbsharemodes) \
+		$(use_with addns 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) \
+		--with-shared-modules=${SHAREDMODS} \
+		--without-included-popt \
+		--without-included-iniparser
+}
+
+src_compile() {
+	# compile libs
+	if use addns ; then
+		einfo "make addns library"
+		emake libaddns
+	fi
+	if use netapi ; then
+		einfo "make netapi library"
+		emake libnetapi
+	fi
+	if use smbclient ; then
+		einfo "make smbclient library"
+		emake libsmbclient
+	fi
+	if use smbsharemodes ; then
+		einfo "make smbsharemodes library"
+		emake libsmbsharemodes
+	fi
+
+	# compile modules
+	emake modules
+
+	# compile pam moudles
+	if use pam ; then
+		einfo "make pam modules"
+		emake pam_modules
+	fi
+
+	# compile winbind nss modules
+	if use winbind ; then
+		einfo "make nss modules"
+		emake nss_modules
+	fi
+
+	# compile utilities
+	if [ -n "${BINPROGS}" ] ; then
+		einfo "make binprogs"
+		emake ${BINPROGS}
+	fi
+	if [ -n "${SBINPROGS}" ] ; then
+		einfo "make sbinprogs"
+		emake ${SBINPROGS}
+	fi
+
+	if [ -n "${KRBPLUGIN}" ] ; then
+		einfo "make krbplugin"
+		emake ${KRBPLUGIN}${PLUGINEXT}
+	fi
+
+	if use client && use kernel_linux; then
+		einfo "make {,u}mount.cifs"
+		emake bin/{,u}mount.cifs
+	fi
+}
+
+src_install() {
+	# install libs
+	if use addns ; then
+		einfo "install addns library"
+		emake installlibaddns DESTDIR="${D}"
+	fi
+	if use netapi ; then
+		einfo "install netapi library"
+		emake installlibnetapi DESTDIR="${D}"
+	fi
+	if use smbclient ; then
+		einfo "install smbclient library"
+		emake installlibsmbclient DESTDIR="${D}"
+	fi
+	if use smbsharemodes ; then
+		einfo "install smbsharemodes library"
+		emake installlibsmbsharemodes DESTDIR="${D}"
+	fi
+
+	# install modules
+	emake installmodules DESTDIR="${D}"
+
+	if use pam ; then
+		einfo "install pam modules"
+		emake installpammodules DESTDIR="${D}"
+
+		if use winbind ; then
+			newpamd "${CONFDIR}/system-auth-winbind.pam" system-auth-winbind
+			doman ../docs/manpages/pam_winbind.8
+			# bug #376853
+			insinto /etc/security
+			doins ../examples/pam_winbind/pam_winbind.conf || die
+		fi
+
+		newpamd "${CONFDIR}/samba.pam" samba
+		dodoc pam_smbpass/README
+	fi
+
+	# Nsswitch extensions. Make link for wins and winbind resolvers
+	if use winbind ; then
+		einfo "install libwbclient"
+		emake installlibwbclient DESTDIR="${D}"
+		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
+		einfo "install libwbclient related manpages"
+		doman ../docs/manpages/idmap_rid.8
+		doman ../docs/manpages/idmap_hash.8
+		if use ldap ; then
+			doman ../docs/manpages/idmap_adex.8
+			doman ../docs/manpages/idmap_ldap.8
+		fi
+		if use ads ; then
+			doman ../docs/manpages/idmap_ad.8
+		fi
+	fi
+
+	# install binaries
+	insinto /usr
+	for prog in ${SBINPROGS} ; do
+		dosbin ${prog}
+		doman ../docs/manpages/${prog/bin\/}*
+	done
+
+	for prog in ${BINPROGS} ; do
+		dobin ${prog}
+		doman ../docs/manpages/${prog/bin\/}*
+	done
+
+	# install krbplugin
+	if [ -n "${KRBPLUGIN}" ] ; then
+		if has_version app-crypt/mit-krb5 ; then
+			insinto /usr/$(get_libdir)/krb5/plugins/libkrb5
+			doins ${KRBPLUGIN}${PLUGINEXT}
+		elif has_version app-crypt/heimdal ; then
+			insinto /usr/$(get_libdir)/plugin/krb5
+			doins ${KRBPLUGIN}${PLUGINEXT}
+		fi
+		insinto /usr
+		for prog in ${KRBPLUGIN} ; do
+			doman ../docs/manpages/${prog/bin\/}*
+		done
+	fi
+
+	# install server components
+	if use server ; then
+		doman ../docs/manpages/vfs* ../docs/manpages/samba.7
+
+		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}
+
+		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}"
+		fi
+
+		dodoc ../MAINTAINERS ../README* ../Roadmap ../WHATSNEW.txt ../docs/THANKS
+	fi
+
+	# install client files ({u,}mount.cifs into /)
+	if use client && use kernel_linux ; then
+		into /
+		dosbin bin/{u,}mount.cifs
+		doman ../docs/manpages/{u,}mount.cifs.8
+	fi
+
+	# install the spooler to cups
+	if use cups ; then
+		dosym /usr/bin/smbspool $(cups-config --serverbin)/backend/smb
+	fi
+
+	# install misc files
+	insinto /etc/samba
+	doins ../examples/smb.conf.default
+	doman  ../docs/manpages/smb.conf.5
+
+	insinto /usr/"$(get_libdir)"/samba
+	doins ../codepages/{valid.dat,upcase.dat,lowcase.dat}
+
+	# install docs
+	if use doc ; then
+		dohtml -r ../docs/htmldocs/*
+		dodoc ../docs/*.pdf
+	fi
+
+	# install examples
+	if use examples ; then
+		insinto /usr/share/doc/${PF}/examples
+
+		if use smbclient ; then
+			doins -r ../examples/libsmbclient
+		fi
+
+		if use winbind ; then
+			doins -r ../examples/pam_winbind ../examples/nss
+		fi
+
+		if use server ; then
+			cd ../examples
+			doins -r auth autofs dce-dfs LDAP logon misc pdb \
+			perfcounter printer-accounting printing scripts tridge \
+			validchars VFS
+		fi
+	fi
+
+	# Remove empty installation directories
+	rmdir --ignore-fail-on-non-empty \
+		"${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"
+}
+
+pkg_postinst() {
+	elog "The default value of 'wide links' has been changed to 'no' in samba 3.5"
+	elog "to avoid an insecure default configuration"
+	elog "('wide links = yes' and 'unix extensions = yes'). For more details,"
+	elog "please see http://www.samba.org/samba/news/symlink_attack.html ."
+	elog ""
+	elog "An EXPERIMENTAL implementation of the SMB2 protocol has been added."
+	elog "SMB2 can be enabled by setting 'max protocol = smb2'. SMB2 is a new "
+	elog "implementation of the SMB protocol used by Windows Vista and higher"
+	elog ""
+	elog "For further information make sure to read the release notes at"
+	elog "http://samba.org/samba/history/${P}.html and "
+	elog "http://samba.org/samba/history/${PN}-3.5.0.html"
+}
diff --git a/net-fs/samba/samba-3.6.10.ebuild b/net-fs/samba/samba-3.6.10.ebuild
index 4e66fd55970a..298b65b51828 100644
--- a/net-fs/samba/samba-3.6.10.ebuild
+++ b/net-fs/samba/samba-3.6.10.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-fs/samba/samba-3.6.10.ebuild,v 1.4 2013/01/01 09:03:08 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-fs/samba/samba-3.6.10.ebuild,v 1.5 2013/01/09 11:42:30 polynomial-c Exp $
 
 EAPI=4
 
@@ -11,7 +11,7 @@ MY_P="${PN}-${MY_PV}"
 
 DESCRIPTION="Library bits of the samba network filesystem"
 HOMEPAGE="http://www.samba.org/"
-SRC_URI="mirror://samba/${MY_P}.tar.gz"
+SRC_URI="mirror://samba/stable/${MY_P}.tar.gz"
 LICENSE="GPL-3"
 SLOT="0"
 KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~x86 ~amd64-fbsd ~x86-fbsd"
diff --git a/net-fs/samba/samba-3.6.9.ebuild b/net-fs/samba/samba-3.6.9.ebuild
index cf6d247c3850..7abb08f92a24 100644
--- a/net-fs/samba/samba-3.6.9.ebuild
+++ b/net-fs/samba/samba-3.6.9.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-fs/samba/samba-3.6.9.ebuild,v 1.7 2012/12/20 13:35:59 nativemad Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-fs/samba/samba-3.6.9.ebuild,v 1.8 2013/01/09 11:42:30 polynomial-c Exp $
 
 EAPI=4
 
@@ -11,7 +11,7 @@ MY_P="${PN}-${MY_PV}"
 
 DESCRIPTION="Library bits of the samba network filesystem"
 HOMEPAGE="http://www.samba.org/"
-SRC_URI="mirror://samba/${MY_P}.tar.gz"
+SRC_URI="mirror://samba/stable/${MY_P}.tar.gz"
 LICENSE="GPL-3"
 SLOT="0"
 KEYWORDS="amd64 ~arm hppa x86 ~amd64-fbsd ~x86-fbsd"
diff --git a/net-fs/samba/samba-4.0.0.ebuild b/net-fs/samba/samba-4.0.0.ebuild
index 2ad7135baf6c..0f2111bb1e08 100644
--- a/net-fs/samba/samba-4.0.0.ebuild
+++ b/net-fs/samba/samba-4.0.0.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-fs/samba/samba-4.0.0.ebuild,v 1.3 2012/12/28 07:22:11 polynomial-c Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-fs/samba/samba-4.0.0.ebuild,v 1.4 2013/01/09 11:42:30 polynomial-c Exp $
 
 EAPI=4
 PYTHON_DEPEND="2"
@@ -15,7 +15,7 @@ if [ "${PV}" = "4.9999" ]; then
 	KEYWORDS=""
 	inherit git-2
 else
-	SRC_URI="mirror://samba/${MY_P}.tar.gz"
+	SRC_URI="mirror://samba/stable/${MY_P}.tar.gz"
 	KEYWORDS="~amd64 ~x86"
 fi
 
diff --git a/net-fs/samba/samba-4.0.0_rc5.ebuild b/net-fs/samba/samba-4.0.0_rc5.ebuild
deleted file mode 100644
index 27edaa5d5a30..000000000000
--- a/net-fs/samba/samba-4.0.0_rc5.ebuild
+++ /dev/null
@@ -1,161 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-fs/samba/samba-4.0.0_rc5.ebuild,v 1.1 2012/11/24 23:59:23 polynomial-c Exp $
-
-EAPI=4
-PYTHON_DEPEND="2"
-
-inherit confutils python waf-utils multilib linux-info
-
-MY_PV="${PV/_rc/rc}"
-MY_P="${PN}-${MY_PV}"
-
-if [ "${PV}" = "4.9999" ]; then
-	EGIT_REPO_URI="git://git.samba.org/samba.git"
-	KEYWORDS=""
-	inherit git-2
-else
-	SRC_URI="mirror://samba/rc/${MY_P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
-fi
-
-DESCRIPTION="Samba Suite Version 4"
-HOMEPAGE="http://www.samba.org/"
-LICENSE="GPL-3"
-
-SLOT="0"
-
-IUSE="acl addns ads aio avahi client cluster cups debug fulltest gnutls iprint
-ldap pam quota selinux swat syslog winbind"
-
-RDEPEND="dev-libs/iniparser
-	dev-libs/popt
-	sys-libs/readline
-	virtual/libiconv
-	>=dev-lang/python-2.4.2
-	dev-python/subunit
-	sys-libs/libcap
-	>=sys-libs/ldb-1.1.13
-	>=sys-libs/tdb-1.2.10[python]
-	>=sys-libs/talloc-2.0.7[python]
-	>=sys-libs/tevent-0.9.17
-	sys-libs/zlib
-	>=app-crypt/heimdal-1.5[-ssl]
-	ads? ( client? ( net-fs/cifs-utils[ads] ) )
-	client? ( net-fs/cifs-utils )
-	cluster? ( >=dev-db/ctdb-1.0.114_p1 )
-	ldap? ( net-nds/openldap )
-	gnutls? ( >=net-libs/gnutls-1.4.0 )
-	selinux? ( sec-policy/selinux-samba )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-RESTRICT="mirror"
-
-S="${WORKDIR}/${MY_P}"
-
-CONFDIR="${FILESDIR}/$(get_version_component_range 1-2)"
-
-WAF_BINARY="${S}/buildtools/bin/waf"
-
-pkg_setup() {
-	confutils_use_depend_all fulltest test
-
-	python_set_active_version 2
-	python_pkg_setup
-
-	if use aio; then
-		if ! linux_config_exists || ! linux_chkconfig_present AIO; then
-				ewarn "You must enable AIO support in your kernel config, "
-				ewarn "to be able to support asynchronous I/O. "
-				ewarn "You can find it at"
-				ewarn
-				ewarn "General Support"
-				ewarn " Enable AIO support "
-				ewarn
-				ewarn "and recompile your kernel..."
-		fi
-	fi
-}
-
-src_configure() {
-	local myconf=''
-	if use "debug"; then
-		myconf="${myconf} --enable-developer"
-	fi
-	if use "cluster"; then
-		myconf="${myconf} --with-ctdb-dir=/usr"
-	fi
-	myconf="${myconf} \
-		--enable-fhs \
-		--sysconfdir=/etc \
-		--localstatedir=/var \
-		--with-modulesdir=/usr/$(get_libdir) \
-		--disable-rpath \
-		--disable-rpath-install \
-		--nopyc \
-		--nopyo \
-		--disable-ntdb \
-		--bundled-libraries=NONE \
-		--builtin-libraries=NONE \
-		$(use_with addns dnsupdate) \
-		$(use_with acl) \
-		$(use_with ads) \
-		$(use_with aio aio-support) \
-		$(use_enable avahi) \
-		$(use_with cluster cluster-support) \
-		$(use_enable cups) \
-		$(use_enable gnutls) \
-		$(use_enable iprint) \
-		$(use_with ldap) \
-		$(use_with pam) \
-		$(use_with pam pam_smbpass) \
-		$(use_with quota) \
-		$(use_with syslog) \
-		$(use_with swat) \
-		$(use_with winbind)"
-	CPPFLAGS="-I/usr/include/et ${CPPFLAGS}" \
-		waf-utils_src_configure ${myconf}
-}
-
-src_install() {
-	waf-utils_src_install
-
-	# Make all .so files executable
-	find "${D}" -type f -name "*.so" -exec chmod +x {} +
-
-	# Move all LDB modules to their correct path
-	mkdir -p "${D}"/usr/$(get_libdir)/ldb/modules/ldb
-	mv "${D}"/usr/$(get_libdir)/ldb/*.so "${D}"/usr/$(get_libdir)/ldb/modules/ldb
-
-	# Install init script and conf.d file
-	newinitd "${CONFDIR}/samba4.initd-r1" samba || die "newinitd failed"
-	newconfd "${CONFDIR}/samba4.confd" samba || die "newconfd failed"
-}
-
-src_test() {
-	local extra_opts=""
-	use fulltest || extra_opts+="--quick"
-	"${WAF_BINARY}" test ${extra_opts} || die "test failed"
-}
-
-pkg_postinst() {
-	# Optimize the python modules so they get properly removed
-	python_mod_optimize "${PN}"
-
-	# Warn that it's a release candidate
-	ewarn "This is not a final Samba release, however the Samba Team is now making"
-	ewarn "good progress towards a Samba 4.0 release, of which this is a preview."
-	ewarn "Be aware the this release contains the best of all of Samba's"
-	ewarn "technology parts, both a file server (that you can reasonably expect"
-	ewarn "to upgrade existing Samba 3.x releases to) and the AD domain"
-	ewarn "controller work previously known as 'samba4'."
-
-	einfo "See http://wiki.samba.org/index.php/Samba4/HOWTO for more"
-	einfo "information about samba 4."
-}
-
-pkg_postrm() {
-	# Clean up the python modules
-	python_mod_cleanup "${PN}"
-}