Cleaning up unused versions, Adding relevant upgrade configuration changes elog, bug #288752, Checking gcc version when building with winbind use flag, bug #320991

Package-Manager: portage-2.1.8.3/cvs/Linux i686

7 files changed, 85 insertions, 750 deletions

diff --git a/net-fs/samba/ChangeLog b/net-fs/samba/ChangeLog
index decc16d3c409..dbe5b37e8a89 100644
--- a/net-fs/samba/ChangeLog
+++ b/net-fs/samba/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-fs/samba
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-fs/samba/ChangeLog,v 1.419 2010/05/24 21:56:45 vostorga Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-fs/samba/ChangeLog,v 1.420 2010/06/01 14:04:59 vostorga Exp $
+
+  01 Jun 2010; Víctor Ostorga <vostorga@gentoo.org> samba-3.4.6.ebuild,
+  samba-3.4.8.ebuild, -samba-3.5.0.ebuild, -samba-3.5.2-r1.ebuild,
+  samba-3.5.3.ebuild:
+  Cleaning up unused versions
+  Adding relevant upgrade configuration changes elog, bug #288752
+  Checking gcc version when building with winbind use flag, bug #320991
 
   24 May 2010; Víctor Ostorga <vostorga@gentoo.org> samba-3.5.3.ebuild:
   Fixing krbplugin install, and server examples location, bug #320953 ,
diff --git a/net-fs/samba/Manifest b/net-fs/samba/Manifest
index 43e8fa95fdd1..2d61451822fc 100644
--- a/net-fs/samba/Manifest
+++ b/net-fs/samba/Manifest
@@ -56,18 +56,14 @@ DIST samba-3.0.37.tar.gz 23416703 RMD160 06b76ae22729e10c83d6af42d03b03ad69e4910
 DIST samba-3.2.15.tar.gz 24435114 RMD160 0046aeaf5b91c34bbc9a387c714caf41ca84d1ae SHA1 52240aa9f2f5584f1978d788024fa2d6cb208e56 SHA256 84281fd1faeffee8558e49dff865dd382abbf78bc1be00f8cb5aa70aeea67d46
 DIST samba-3.4.6.tar.gz 34849318 RMD160 d94c6c85e1c30a160d3440630943fd0af2f8da72 SHA1 7896340d96a9c7f8a57d3a4c425bbbed78886f5c SHA256 c06504a5dcf6f0dea26c40869e7350af634500114052ddaf3590086cfbba6a16
 DIST samba-3.4.8.tar.gz 34851288 RMD160 a43d6fcfa3745754afca9d2c35682f69217b3040 SHA1 941daefd092e94eb9fb57d4617fcc6844c967317 SHA256 5237bc7a32e0eafd70b78c9cd6735e46dbad0c6f9794f50476b50dd1b43752d6
-DIST samba-3.5.0.tar.gz 30755153 RMD160 4c0169a3b5d1b7e08f10264a31165fcf94896de2 SHA1 68a6c2c47dd9e791ca58ad810fc5838fe0e27f35 SHA256 074217e5438affa45906f5e1395633a57f7cd25453adfdba9fa442bab7f3266f
-DIST samba-3.5.2.tar.gz 30777854 RMD160 711399686623d671461cba5738a6603b68ea0988 SHA1 f49733ea2fb9715bd4ec24d7ec96668cc6a97a1f SHA256 82dac9121a0c7ca8c4bb5dae036c060c2242d5bce7a8a67656f414eba921295e
 DIST samba-3.5.3.tar.gz 30801998 RMD160 0ab444b3d1aa8c1fc0d85cf8d1c8cb6cbd9e98ad SHA1 e9de369de7c8a17db18d3b7a315d1d5305f3b509 SHA256 cc8d6c6fe857ee1f5d0e1b7a8280dabb8c9b01e2d81aa707dbf6ceebe1e884d0
 DIST samba-4.0.0alpha11.tar.gz 13917363 RMD160 3ec5597de6a2c80eaa426712101777fa92786b5c SHA1 8ed2befbbd45f6501d9e6036bcdfb332431a7b4f SHA256 ec9f4a9153b9e2c233420642ee98a8b944322e8b39a9b6912430fb24e88b81b9
 DIST samba-vscan-0.3.6c-beta5.tar.gz 248183 RMD160 6929c30b57e342c4bdf6a6b432fbe41c2ac70a74 SHA1 9e1b37225246ff2f19e37aceb97a680afc82cdda SHA256 bfe910d54add8dcb87d5babdf50127a6dcf079e0e90ad9947b4cbfdbe3e3037d
 EBUILD samba-3.0.37.ebuild 9995 RMD160 84b79edc774ea3053755016756724cf14e757691 SHA1 0676513a746314c5e537b4406e30da43f9531bc4 SHA256 f60a6f01b09319539da9fedb24652e4c0104d0ead9d3ae7fe741bf0910a5bb77
 EBUILD samba-3.2.15.ebuild 8586 RMD160 1b4e8d899150a548892ac7c91f0e6165f8ca0171 SHA1 660bdcb314a0d5fc0988fecf806952f0356e4065 SHA256 d5d9c1a5f56bb7c936c4aeae7c72cb16e1c1a92313670cd5131e56c20873a8b1
-EBUILD samba-3.4.6.ebuild 10276 RMD160 d93c3ceb9379ea30725e97c31385e407057511c5 SHA1 c26ae1872ee23faf52298ca7a811c498f2d0e455 SHA256 b15d6541805a8fbba938991c3c4d4325a09bfc031bc81b5084e5ff670b81cce6
-EBUILD samba-3.4.8.ebuild 10279 RMD160 8b074f156261ac02ccea0498128baaa111cb49c5 SHA1 54aa753544d2364222595ff6e2e696fb71a53c55 SHA256 406ac133473a56f6a35987f483dd11e7891d0c41b16ff1e7c479304444d4430d
-EBUILD samba-3.5.0.ebuild 10367 RMD160 3747350a7c8fb15ba076a61335fb9c2232787d8e SHA1 8ad51a352093142f65971f84761b12092205f2e1 SHA256 acf23ab0b379185db2d2577da1bf078687b6bb3047ac497153264c464b99cc99
-EBUILD samba-3.5.2-r1.ebuild 10383 RMD160 e696906d98534964483c9ea731dd0e5377d0440e SHA1 f4f53d3fd39152ca575234c1f61fc88306b54da0 SHA256 e39214300e0fbdb2f8e401772a53b425eba4678c09c5a6f769f67610dbed60e0
-EBUILD samba-3.5.3.ebuild 11023 RMD160 2ccd1ebd8a0a8849bf0fc32ba8ec2e8c8e347af8 SHA1 ba12cb10b9b524a6dbf2c250653ae7f561edadc9 SHA256 896c1ceac5e4b4cc3cb079f7aa46d475dba05e9b67a081f35b0494b305a59bef
+EBUILD samba-3.4.6.ebuild 11222 RMD160 6331d03c1c790f114fcf249ede5cd59e4f475fbe SHA1 580ff2dacd5aab47c918efe40afdcd3952ebb924 SHA256 873561e5aed78587bb383be3e96400179e6f0a30e1930461c64d7deb9c153f53
+EBUILD samba-3.4.8.ebuild 11225 RMD160 d74c11b689b2dad596b8eea9492314011525eb3e SHA1 c2690585a1b0cdb2673dbf0fb86286fd3a5fdc9c SHA256 2b4295d74c51250ab53d9a8ac6b14d0ca3e65a9b76bcb004c128fafbb3881a1d
+EBUILD samba-3.5.3.ebuild 12110 RMD160 2abca03fa42432f7a2152f91c9f9f3063118e5fe SHA1 2e6c00c2d6406bea9852b8c41bcd57d033a80c89 SHA256 80cc3054d394a9f31471892d9845fd6a922e81104472a5fdf1b77a8dede8a5a7
 EBUILD samba-4.0.0_alpha11.ebuild 4156 RMD160 d63bbf124c3fde8d264da490122a0826dda1aa13 SHA1 4bd67529b6094b91349e138614ba36075e5912c5 SHA256 619c7c38aa499083e3ee7ba06f681851b76a4456c1b8e8f3d4f3c998eaccda58
-MISC ChangeLog 69778 RMD160 69d8fa135367b2ebad3a8553cd980a608d65ffd8 SHA1 d96f13bbd35f0c5b28d365e30406887e80cb300d SHA256 7720fd6ea71af04de4f5e8170126956d8687bdb10abaecdd38b4145ebf7bdb06
+MISC ChangeLog 70109 RMD160 3dc19b06bc6d9d2f53ca3c3c74c14b354d588dfe SHA1 e7da764c4d2fa621d4583b873a73cdcba0f536cb SHA256 4e479624bc24fda24cd33b9c472c819e048e27221077dffd353c1818e967505a
 MISC metadata.xml 1678 RMD160 fc5f6a9674053523edb993fda99f75789e995231 SHA1 7a3f710083ab340eb139281a0d9d94af1aaa4927 SHA256 afeddf0c54227bcdd40ccc67c65b5ee8809cbba447d0500773270d89de7d044e
diff --git a/net-fs/samba/samba-3.4.6.ebuild b/net-fs/samba/samba-3.4.6.ebuild
index eb7653a0786e..1c3638da0a01 100644
--- a/net-fs/samba/samba-3.4.6.ebuild
+++ b/net-fs/samba/samba-3.4.6.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-fs/samba/samba-3.4.6.ebuild,v 1.6 2010/05/20 00:04:21 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-fs/samba/samba-3.4.6.ebuild,v 1.7 2010/06/01 14:04:59 vostorga Exp $
 
 EAPI="2"
 
@@ -82,6 +82,17 @@ S="${WORKDIR}/${MY_P}/source3"
 CONFDIR="${FILESDIR}/$(get_version_component_range 1-2)"
 
 pkg_setup() {
+
+	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
+
 	confutils_use_depend_all ads ldap
 	confutils_use_depend_all swat server
 }
@@ -365,3 +376,15 @@ src_install() {
 		"${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 passdb backend has been changed to 'tdbsam' in samba 3.4!"
+	elog "That breaks existing setups using the 'smbpasswd' backend without"
+	elog "explicit declaration!"
+	elog "Please use 'passdb backend = smbpasswd' if you would like to stick to the"
+	elog "'smbpasswd' backend or convert your smbpasswd entries using e.g. "
+	elog "'pdbedit -i smbpasswd -e tdbsam'."
+	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.4.0.html"
+}
diff --git a/net-fs/samba/samba-3.4.8.ebuild b/net-fs/samba/samba-3.4.8.ebuild
index 6481fc7e6d8b..bc2a20b1462e 100644
--- a/net-fs/samba/samba-3.4.8.ebuild
+++ b/net-fs/samba/samba-3.4.8.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-fs/samba/samba-3.4.8.ebuild,v 1.3 2010/05/19 17:16:15 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-fs/samba/samba-3.4.8.ebuild,v 1.4 2010/06/01 14:04:59 vostorga Exp $
 
 EAPI="2"
 
@@ -82,6 +82,16 @@ S="${WORKDIR}/${MY_P}/source3"
 CONFDIR="${FILESDIR}/$(get_version_component_range 1-2)"
 
 pkg_setup() {
+	 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
+
 	confutils_use_depend_all ads ldap
 	confutils_use_depend_all swat server
 }
@@ -365,3 +375,15 @@ src_install() {
 		"${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 passdb backend has been changed to 'tdbsam' in samba 3.4!"
+	elog "That breaks existing setups using the 'smbpasswd' backend without"
+	elog "explicit declaration!"
+	elog "Please use 'passdb backend = smbpasswd' if you would like to stick to the"
+	elog "'smbpasswd' backend or convert your smbpasswd entries using e.g. "
+	elog "'pdbedit -i smbpasswd -e tdbsam'."
+	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.4.0.html"
+}
diff --git a/net-fs/samba/samba-3.5.0.ebuild b/net-fs/samba/samba-3.5.0.ebuild
deleted file mode 100644
index 6ce9be93bb9d..000000000000
--- a/net-fs/samba/samba-3.5.0.ebuild
+++ /dev/null
@@ -1,368 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-fs/samba/samba-3.5.0.ebuild,v 1.2 2010/05/19 17:16:15 jer Exp $
-
-EAPI="2"
-
-inherit pam confutils versionator multilib
-
-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/${P}.tar.gz"
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
-IUSE="acl addns ads aio avahi caps +client cluster cups debug doc examples fam
-	ldap ldb +netapi pam quota +readline +server +smbclient smbsharemodes swat
-	syslog winbind "
-
-DEPEND="dev-libs/popt
-	!net-fs/samba-client
-	!net-fs/samba-libs
-	!net-fs/samba-server
-	sys-libs/talloc
-	sys-libs/tdb
-	virtual/libiconv
-	ads? ( virtual/krb5 sys-fs/e2fsprogs
-		client? ( sys-apps/keyutils ) )
-	avahi? ( net-dns/avahi )
-	caps? ( sys-libs/libcap )
-	client? ( !net-fs/mount-cifs
-		dev-libs/iniparser )
-	cluster? ( dev-db/ctdb )
-	cups? ( net-print/cups )
-	debug? ( dev-libs/dmalloc )
-	fam? ( virtual/fam )
-	ldap? ( net-nds/openldap )
-	pam? ( virtual/pam
-		winbind? ( dev-libs/iniparser ) )
-	readline? ( >=sys-libs/readline-5.2 )
-	syslog? ( virtual/logger )"
-
-RDEPEND="${DEPEND}"
-
-# Disable tests since we don't want to build that much here
-RESTRICT="test"
-
-SBINPROGS=""
-BINPROGS=""
-
-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 swat && SBINPROGS="${SBINPROGS} bin/swat"
-	use winbind && SBINPROGS="${SBINPROGS} bin/winbindd"
-	use ads && use winbind && SBIN_PROGS="${SBINPROGS} 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";
-use winbind && BINPROGS="${BINPROGS} bin/wbinfo"
-
-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)"
-
-pkg_setup() {
-	confutils_use_depend_all ads ldap
-	confutils_use_depend_all swat server
-}
-
-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"
-}
-
-src_configure() {
-	local myconf
-
-	# Filter out -fPIE
-	[[ ${CHOST} == *-*bsd* ]] || 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
-
-	# use_with doesn't accept 2 USE-flags
-	if use client && use ads ; then
-		myconf="${myconf} --with-cifsupcall"
-	else
-		myconf="${myconf} --without-cifsupcall"
-	fi
-
-	# 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 debug dmalloc) \
-		$(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 client cifsmount) \
-		$(use_with client cifsumount) \
-		$(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) \
-		--without-included-popt \
-		--without-included-iniparser
-}
-
-src_compile() {
-	# compile libs
-	if use addns ; then
-		einfo "make addns library"
-		emake libaddns || die "emake libaddns failed"
-	fi
-	if use netapi ; then
-		einfo "make netapi library"
-		emake libnetapi || die "emake libnetapi failed"
-	fi
-	if use smbclient ; then
-		einfo "make smbclient library"
-		emake libsmbclient || die "emake libsmbclient failed"
-	fi
-	if use smbsharemodes ; then
-		einfo "make smbsharemodes library"
-		emake libsmbsharemodes || die "emake libsmbsharemodes failed"
-	fi
-
-	# compile modules
-	emake modules || die "building modules failed"
-
-	# compile pam moudles
-	if use pam ; then
-		einfo "make pam modules"
-		emake pam_modules || die "emake pam_modules failed";
-	fi
-
-	# compile winbind nss modules
-	if use winbind ; then
-		einfo "make nss modules"
-		emake nss_modules || die "emake nss_modules failed";
-	fi
-
-	# compile utilities
-	if [ -n "${BINPROGS}" ] ; then
-		einfo "make binprogs"
-		emake ${BINPROGS} || die "emake binprogs failed";
-	fi
-	if [ -n "${SBINPROGS}" ] ; then
-		einfo "make sbinprogs"
-		emake ${SBINPROGS} || die "emake sbinprogs failed";
-	fi
-
-	if use client ; then
-		einfo "make {,u}mount.cifs"
-		emake bin/{,u}mount.cifs || die "emake {,u}mount.cifs failed"
-	fi
-}
-
-src_install() {
-	# install libs
-	if use addns ; then
-		einfo "install addns library"
-		emake installlibaddns DESTDIR="${D}" || die "emake install libaddns failed"
-	fi
-	if use netapi ; then
-		einfo "install netapi library"
-		emake installlibnetapi DESTDIR="${D}" || die "emake install libnetapi failed"
-	fi
-	if use smbclient ; then
-		einfo "install smbclient library"
-		emake installlibsmbclient DESTDIR="${D}" || die "emake install libsmbclient failed"
-	fi
-	if use smbsharemodes ; then
-		einfo "install smbsharemodes library"
-		emake installlibsmbsharemodes DESTDIR="${D}" || die "emake install libsmbsharemodes failed"
-	fi
-
-	# install modules
-	emake installmodules DESTDIR="${D}" || die "installing modules failed"
-
-	if use pam ; then
-		einfo "install pam modules"
-		emake installpammodules DESTDIR="${D}" || die "emake installpammodules failed"
-
-		if use winbind ; then
-			newpamd "${CONFDIR}/system-auth-winbind.pam" system-auth-winbind
-			doman ../docs/manpages/pam_winbind.8
-		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}" || die "emake installlibwbclient failed"
-		dolib.so ../nsswitch/libnss_wins.so
-		dosym libnss_wins.so /usr/$(get_libdir)/libnss_wins.so.2
-		dolib.so ../nsswitch/libnss_winbind.so
-		dosym libnss_winbind.so /usr/$(get_libdir)/libnss_winbind.so.2
-	fi
-
-	# install binaries
-	insinto /usr
-	for prog in ${SBINPROGS} ; do
-		dosbin ${prog} || die "installing ${prog} failed"
-		doman ../docs/manpages/${prog/bin\/}* || die "doman failed"
-	done
-	dobin ${BINPROGS} || die "installing binaries failed"
-	for prog in ${BINPROGS} ; do
-		dobin ${prog} || die "installing ${prog} failed"
-		doman ../docs/manpages/${prog/bin\/}* || die "doman failed"
-	done
-
-	# 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}" \
-				|| die "installing swat failed"
-		fi
-
-		dodoc ../MAINTAINERS ../README* ../Roadmap ../WHATSNEW.txt ../docs/THANKS
-	fi
-
-	# install client files ({u,}mount.cifs into /)
-	if use client ; then
-		into /
-		dosbin bin/{u,}mount.cifs || die "u/mount.cifs not around"
-		doman ../docs/manpages/{u,}mount.cifs.8 || die "can't create man pages"
-	fi
-
-	# install the spooler to cups
-	use cups && dosym /usr/bin/smbspool $(cups-config --serverbin)/backend/smb
-
-	# install misc files
-	insinto /etc/samba
-	doins "${CONFDIR}"/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
-		einfo "install examples"
-		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
-			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"
-}
diff --git a/net-fs/samba/samba-3.5.2-r1.ebuild b/net-fs/samba/samba-3.5.2-r1.ebuild
deleted file mode 100644
index e15c0f4677e1..000000000000
--- a/net-fs/samba/samba-3.5.2-r1.ebuild
+++ /dev/null
@@ -1,370 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-fs/samba/samba-3.5.2-r1.ebuild,v 1.3 2010/05/19 17:16:15 jer Exp $
-
-EAPI="2"
-
-inherit pam confutils 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/${P}.tar.gz"
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
-IUSE="acl addns ads aio avahi caps +client cluster cups debug doc examples fam
-	ldap ldb +netapi pam quota +readline +server +smbclient smbsharemodes swat
-	syslog winbind "
-
-DEPEND="dev-libs/popt
-	!net-fs/samba-client
-	!net-fs/samba-libs
-	!net-fs/samba-server
-	sys-libs/talloc
-	sys-libs/tdb
-	virtual/libiconv
-	ads? ( virtual/krb5 sys-fs/e2fsprogs
-		client? ( sys-apps/keyutils ) )
-	avahi? ( net-dns/avahi )
-	caps? ( sys-libs/libcap )
-	client? ( !net-fs/mount-cifs
-		dev-libs/iniparser )
-	cluster? ( dev-db/ctdb )
-	cups? ( net-print/cups )
-	debug? ( dev-libs/dmalloc )
-	fam? ( virtual/fam )
-	ldap? ( net-nds/openldap )
-	pam? ( virtual/pam
-		winbind? ( dev-libs/iniparser ) )
-	readline? ( >=sys-libs/readline-5.2 )
-	syslog? ( virtual/logger )"
-
-RDEPEND="${DEPEND}"
-
-# Disable tests since we don't want to build that much here
-RESTRICT="test"
-
-SBINPROGS=""
-BINPROGS=""
-
-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 swat && SBINPROGS="${SBINPROGS} bin/swat"
-	use winbind && SBINPROGS="${SBINPROGS} bin/winbindd"
-	use ads && use winbind && SBINPROGS="${SBINPROGS} 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";
-use winbind && BINPROGS="${BINPROGS} bin/wbinfo"
-
-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)"
-
-pkg_setup() {
-	confutils_use_depend_all ads ldap
-	confutils_use_depend_all swat server
-}
-
-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"
-
-	cd "${S}/../" && epatch "${FILESDIR}"/${PV}-backport-fix-*
-}
-
-src_configure() {
-	local myconf
-
-	# Filter out -fPIE
-	[[ ${CHOST} == *-*bsd* ]] || 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
-
-	# use_with doesn't accept 2 USE-flags
-	if use client && use ads ; then
-		myconf="${myconf} --with-cifsupcall"
-	else
-		myconf="${myconf} --without-cifsupcall"
-	fi
-
-	# 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 debug dmalloc) \
-		$(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 client cifsmount) \
-		$(use_with client cifsumount) \
-		$(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) \
-		--without-included-popt \
-		--without-included-iniparser
-}
-
-src_compile() {
-	# compile libs
-	if use addns ; then
-		einfo "make addns library"
-		emake libaddns || die "emake libaddns failed"
-	fi
-	if use netapi ; then
-		einfo "make netapi library"
-		emake libnetapi || die "emake libnetapi failed"
-	fi
-	if use smbclient ; then
-		einfo "make smbclient library"
-		emake libsmbclient || die "emake libsmbclient failed"
-	fi
-	if use smbsharemodes ; then
-		einfo "make smbsharemodes library"
-		emake libsmbsharemodes || die "emake libsmbsharemodes failed"
-	fi
-
-	# compile modules
-	emake modules || die "building modules failed"
-
-	# compile pam moudles
-	if use pam ; then
-		einfo "make pam modules"
-		emake pam_modules || die "emake pam_modules failed";
-	fi
-
-	# compile winbind nss modules
-	if use winbind ; then
-		einfo "make nss modules"
-		emake nss_modules || die "emake nss_modules failed";
-	fi
-
-	# compile utilities
-	if [ -n "${BINPROGS}" ] ; then
-		einfo "make binprogs"
-		emake ${BINPROGS} || die "emake binprogs failed";
-	fi
-	if [ -n "${SBINPROGS}" ] ; then
-		einfo "make sbinprogs"
-		emake ${SBINPROGS} || die "emake sbinprogs failed";
-	fi
-
-	if use client ; then
-		einfo "make {,u}mount.cifs"
-		emake bin/{,u}mount.cifs || die "emake {,u}mount.cifs failed"
-	fi
-}
-
-src_install() {
-	# install libs
-	if use addns ; then
-		einfo "install addns library"
-		emake installlibaddns DESTDIR="${D}" || die "emake install libaddns failed"
-	fi
-	if use netapi ; then
-		einfo "install netapi library"
-		emake installlibnetapi DESTDIR="${D}" || die "emake install libnetapi failed"
-	fi
-	if use smbclient ; then
-		einfo "install smbclient library"
-		emake installlibsmbclient DESTDIR="${D}" || die "emake install libsmbclient failed"
-	fi
-	if use smbsharemodes ; then
-		einfo "install smbsharemodes library"
-		emake installlibsmbsharemodes DESTDIR="${D}" || die "emake install libsmbsharemodes failed"
-	fi
-
-	# install modules
-	emake installmodules DESTDIR="${D}" || die "installing modules failed"
-
-	if use pam ; then
-		einfo "install pam modules"
-		emake installpammodules DESTDIR="${D}" || die "emake installpammodules failed"
-
-		if use winbind ; then
-			newpamd "${CONFDIR}/system-auth-winbind.pam" system-auth-winbind
-			doman ../docs/manpages/pam_winbind.8
-		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}" || die "emake installlibwbclient failed"
-		dolib.so ../nsswitch/libnss_wins.so
-		dosym libnss_wins.so /usr/$(get_libdir)/libnss_wins.so.2
-		dolib.so ../nsswitch/libnss_winbind.so
-		dosym libnss_winbind.so /usr/$(get_libdir)/libnss_winbind.so.2
-	fi
-
-	# install binaries
-	insinto /usr
-	for prog in ${SBINPROGS} ; do
-		dosbin ${prog} || die "installing ${prog} failed"
-		doman ../docs/manpages/${prog/bin\/}* || die "doman failed"
-	done
-
-	for prog in ${BINPROGS} ; do
-		dobin ${prog} || die "installing ${prog} failed"
-		doman ../docs/manpages/${prog/bin\/}* || die "doman failed"
-	done
-
-	# 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}" \
-				|| die "installing swat failed"
-		fi
-
-		dodoc ../MAINTAINERS ../README* ../Roadmap ../WHATSNEW.txt ../docs/THANKS
-	fi
-
-	# install client files ({u,}mount.cifs into /)
-	if use client ; then
-		into /
-		dosbin bin/{u,}mount.cifs || die "u/mount.cifs not around"
-		doman ../docs/manpages/{u,}mount.cifs.8 || die "can't create man pages"
-	fi
-
-	# install the spooler to cups
-	use cups && dosym /usr/bin/smbspool $(cups-config --serverbin)/backend/smb
-
-	# install misc files
-	insinto /etc/samba
-	doins "${CONFDIR}"/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
-		einfo "install examples"
-		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
-			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"
-}
diff --git a/net-fs/samba/samba-3.5.3.ebuild b/net-fs/samba/samba-3.5.3.ebuild
index ab6d4a960b93..66a758def464 100644
--- a/net-fs/samba/samba-3.5.3.ebuild
+++ b/net-fs/samba/samba-3.5.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-fs/samba/samba-3.5.3.ebuild,v 1.4 2010/05/24 21:56:45 vostorga Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-fs/samba/samba-3.5.3.ebuild,v 1.5 2010/06/01 14:04:59 vostorga Exp $
 
 EAPI="2"
 
@@ -84,6 +84,16 @@ S="${WORKDIR}/${MY_P}/source3"
 CONFDIR="${FILESDIR}/$(get_version_component_range 1-2)"
 
 pkg_setup() {
+	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
+
 	confutils_use_depend_all ads ldap
 	confutils_use_depend_all swat server
 }
@@ -392,3 +402,18 @@ src_install() {
 		"${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"
+}