Version bump to 3.5.18

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

3 files changed, 464 insertions, 2 deletions

diff --git a/net-fs/samba/ChangeLog b/net-fs/samba/ChangeLog
index 07207fdedf3a..9a0e63d9574a 100644
--- a/net-fs/samba/ChangeLog
+++ b/net-fs/samba/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-fs/samba
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-fs/samba/ChangeLog,v 1.528 2012/10/16 21:29:44 vostorga Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-fs/samba/ChangeLog,v 1.529 2012/10/17 22:05:43 vostorga Exp $
+
+*samba-3.5.18 (17 Oct 2012)
+
+  17 Oct 2012; Víctor Ostorga <vostorga@gentoo.org> +samba-3.5.18.ebuild:
+  Version bump to 3.5.18
 
 *samba-4.0.0_rc3 (16 Oct 2012)
 
diff --git a/net-fs/samba/Manifest b/net-fs/samba/Manifest
index d295ef9e5fe1..f40bb2b6d1f2 100644
--- a/net-fs/samba/Manifest
+++ b/net-fs/samba/Manifest
@@ -25,6 +25,7 @@ AUX samba-3.4.2-lib.tevent.python.mk 177 SHA256 3eab52d42a0cbc070d011a131f9a56f4
 AUX samba4.initd 657 SHA256 4c8d1ecf42d58bfa1a2087ba9da55ed410ad238a0050272cb84c2e8d50b034d9 SHA512 3373f2ad30938dd8c2d68d19af4e248470e0b6d749b53257c97d3a0792df54f9ad61a33175ae3e576b728cc11a6ae5fd8803c22188382c7b50ca041b98b84ce7 WHIRLPOOL 25f6a313323b3076ad2a5ff733b1ed4bae1833bf5d4d1aaf9c75449e578ca479998b526a1fdfefbe5d5436c94cbcf6b38934bda1ddff8587f8820a2ccb5ce1e9
 DIST samba-3.5.15.tar.gz 30368870 SHA256 c23c67c1212b7ff2e68a9e047a22200e1ad447d5ac1bd3cf24363f4b5875d396 SHA512 917864ba014a3180583bf8ce9d89a61c17e5d8b19256a603420481eaf69208600e0e525b9036570dabc1136b2dc0e125627b6f495ad4292f68c1722f6865cada WHIRLPOOL c02d16056baf0dff0783b6f8593e80cbe21144cbf26ef0c15a806ef6520d2d8d263a052e41eba2c66fee1dd47c0385eda119c356665fae2978dcb64accc44981
 DIST samba-3.5.17.tar.gz 35368811 SHA256 793f38ab2df6b2431c469c6b7018fc21638475a4cb241614af2b7537d54fbce8 SHA512 9712cd1e04885ce302086d3801d934ca9cdd1a363ac5a804734a2e6c2e6e21dad135e3aaf63a1bb1e4eb96e000517a8d608c9e5c5df80414f7705894a2a0e9b3 WHIRLPOOL a3ac96492f7823398090beaa81ce60f545899fea8ea767133acde03abb1210f9c50f27b04b9f6a42c33b3205e5228138e07ef38ecc46e162aae4278146c0c9dc
+DIST samba-3.5.18.tar.gz 35371052 SHA256 ff684a20a5a27fae6027fcedcedba10da73743cff331e22f5994b1212ee8ae16 SHA512 ee537e031f60b477136df8ab88e42d8f7c36bc168e676592be45836d494fe3bb32439ebb82b24e06f16674526c83647e81431552bbe61ef04b176f9811a73346 WHIRLPOOL fdcc932f2e9139d47d1bf36280ed58e27b005885ed72f2b9fd0e75802c3189efaba14b91a62bb2924a41d45fc34b87a2946a72453f21ea2dc84bdeddbf92db88
 DIST samba-3.6.6.tar.gz 34061741 SHA256 67685f2badf7451cb06ad60534784072947c3a845e4d0afec5ab7817f2ee9310 SHA512 f9045c57bbce04bbaf5540ee92ce78437d5f53bbf424384c1c6e5a1cd0822a4e0c913a8e4bfbe836950b4195a7c90ff29c1ffd9304d28d3dd7138ca69de05b4b WHIRLPOOL 5df2dea100d3050d1f33ab3144b6c91441c7821367596e2eb64ac4936c309bcbedfc39a652c3f14103bdc4e91c075b88a7acd2b41ddc839ef0cb5f861fe363cc
 DIST samba-3.6.7.tar.gz 34067900 SHA256 b858a0f011ba7fe554881b9c7e6cb1c9cb7face22ed86860f560fcaecc4ed4ca SHA512 3b7282b010aaafa2672403e6cda7dfbb4a4d53feabe864099a96513c89a1dcb1d254a3dfa1c4a303bab1ff961ecf1a6fb58b13bffa07255d901ef2d5529b4ce3 WHIRLPOOL 23c0444a4501116a126ecaf49e48a83d47a15010dbfe7ecc96f0e705d4d8c3b03da8ba5f036b983d5a2d57282ef2217a33eff8c3d104e254c38319a4bb35a93b
 DIST samba-3.6.8.tar.gz 34070798 SHA256 4f5a171a8d902c6b4f822ed875c51eb8339196d9ccf0ecd7f6521c966b3514de SHA512 11d7161c6b1c50b740338b80a5d55f0f7f07f6c6f5218b1c8e8e2d3ea14e2e22069a2342700777bbdce734cdf723d00d518f4f9837fbadeac2baf326eb98ee6d WHIRLPOOL 5422473a01f5650ee4ddb31779b85591790fd9e54c01c4be82413b88b209e515e23d1a48d96e7bbbee3830cab5f52014a4268ed50625eb5f81b34edaa8e32b7e
@@ -35,6 +36,7 @@ DIST samba-4.0.0rc3.tar.gz 22007301 SHA256 c067b8e939ae0d88e7d0fa37d3b19171e9794
 DIST smb_traffic_analyzer_v2.diff.bz2 12226 SHA256 1bae7eafbe8ac2382313d5ab9d43d73ba64b63a714f0f588516952d476fb868d SHA512 aa0e457a0dd282e61e6dfcd5705c29b319832dca9711b1b5baf8373e2f079991399c3537c050219ccb861a93f86353ebff677a5c625d2e3f1f3a13ee5c4087d0 WHIRLPOOL 85ee72a360f67ebe71be5cd400ecd635280a0d7c64ebb8b94656a5ef1a94f74a987de86408af00ce1b81cc8363b1b3cf14726860d29b72ee610d4bab73d6b139
 EBUILD samba-3.5.15.ebuild 12342 SHA256 aad766339433b9e2e265a0a3dec05d8652a4dd81c637388c86c7f84764b6d2cf SHA512 c43b443853242ca0a49b0f638fa865da261eaa1eab8b89b26986fb25e98a79a5fd741533749ea12696b5ebc794eefdae7344159ca19d6ad221d74172d8840d0d WHIRLPOOL 65c82be0756745c0322fbb63a1508dd901a0ac335798d3f15738749ad9f79bb6db4f86df6633a0acc5a0506a572e113ac8a302d3854ef9b316d42be82cf0b9e9
 EBUILD samba-3.5.17.ebuild 12409 SHA256 59e26b5d505a45d5a8e210a85332420e4670c6cc4e680ca48e9a2ee3eb53a618 SHA512 58fbd7fed095deb0542f6e503d70f50ef7390dc6233e8fbec0aed9db23010a14579e13fcb6c1ddde1bca6ddf0c7c92ef77c6276994fa99c893b5ef10d1c148be WHIRLPOOL 4fe35da89937459c9fda46de98666ad83785e37b1309eb910af20139c66093b8b8cc57b8582b721a944d78f49cd1eae142dc4f1a9af17438b1c565ac4d7f296c
+EBUILD samba-3.5.18.ebuild 12410 SHA256 2f8f66fa8b51b11ecde9dc4ff5a82633d8444a17d261a4c3f28dbacdae7b92f6 SHA512 edb0a6c2ee5a0c7bc169d40a733f2c36cd002e0c46938ab7d9c52c5c5cf433f0e2f9214142bccba980eedff8560b163eef0e0ecb92952c9d08c8c6cec30a8171 WHIRLPOOL 19c9de623df20445006d7ce76e2b67cd03d0c04a85d9446a030df15c231cc71c68e6c7d3eccbf0631bf5f3ee59b02421aec025543ff2cc4466211106b878a74a
 EBUILD samba-3.6.6.ebuild 11584 SHA256 13554505e9e660d03b8e25b5a243d8ba3e912bd37a93654f3723db57645c2afe SHA512 e3cb1ca7620450e74f942aa7182d4af88e9a47aae7bac1725badd2b7d8e35e9c50adf2edb05328fd889dc1ee05ed48035a0876460d60efe4d95b0192bbdee9f1 WHIRLPOOL 0405d3d068f8caed4db6e68ec0fff7ff6daa7eda56e12dcc5008b675858e825d8096c5a54fa6d9a60db559fc48a9cf30852222210d2ab1821e1caab89980bb00
 EBUILD samba-3.6.7.ebuild 11761 SHA256 952ce5215044989d03daf5ba664a0d065b84b80886547b269966664bd66cbccb SHA512 ae06acee02811d09043e18bfb890c631efbf809caa124a7fb89400940fb9e6d0a01c8a14fc84887e6aac23dbad7a11cdd6fc6448b366b5be20293752e90a6519 WHIRLPOOL d51d0a76a0c44eacc5b85f84914ba590b3b176b530041f323e8d59aa7dc2fc6be2abbaecb3922c391e17eb389061778c2cfd96d40a9d7b23dbef181ff01e7964
 EBUILD samba-3.6.8.ebuild 11765 SHA256 a71492db7bc9be34981095bb14bb7bacc7b94bc25f48d35f33d893557c33e681 SHA512 33352d6454c0e36287938a31b7c6fe325451b2c173abe7e58ecfbe36bda967b66f135dce051bc3f42f571c20a25d4fac4d69f59aafd08430458b81a2ee737110 WHIRLPOOL 935fa29439729868b996b7ad555dc9a8fc283dadab5346ffe3244668cbb240ebf4fe109c5c1e87f567a11c18781fa215288af62624e1712d035800939c446b2d
@@ -42,5 +44,5 @@ EBUILD samba-4.0.0_alpha17.ebuild 3221 SHA256 988fef8633eb5c192e664ef80de0340604
 EBUILD samba-4.0.0_rc1.ebuild 4097 SHA256 93054c114ba5e0b0e5df71854d187976c5c7ba69f9c43f2704a83f9e3a279974 SHA512 79eb2997b9ca2dcbc5a34f9cd65be82b5fc6bf6670d37ebf5f7f380c6ee8405900e99a2edc743528b284c86a11b3738375c6e0ba8290ca140b71ddc0af9a4370 WHIRLPOOL c7fb9bbcb551bde808bf41aba224cb407dfb2991dd2c98628f9b566f5e1dce1980911164eead15349afa93d341e1acfe397088cafe77336656643d809d503e99
 EBUILD samba-4.0.0_rc2.ebuild 4093 SHA256 841829d18d2791fa5535e6c75fc35e53d51f564e2c797d378fc2367172d0c405 SHA512 d1685c27b3934fe782e55b9c239bc2c26cf53a3c705e5b8a62ee813990cfaa295c7477e70db98494a43d38d0dada054f608554685c3e25639724168c311bdc0a WHIRLPOOL 45509cd6e24e97548ebfe3583efc2989287298d10d5417bcb93b64d3ffda50058df1de57a21f83696c845571585c00ba5693eec7e7f2c41c7f663b0f1330c875
 EBUILD samba-4.0.0_rc3.ebuild 4098 SHA256 2530f348b91672bd618202c5ec91de8570f8169cf28ab200f269b116ba00fd2b SHA512 ce117a79e835c829c0666df1b81fded1ce71bb07aa1fc83adde0a39b9b2dd002a0bb301a030d4291167b056857659922a9cd278aa0cbfaab74ccb75ae3ae6be2 WHIRLPOOL 30deb7daf586b2ef6f558ab0312bac17e0fb02db0909f6b1d0fb0edaeb53e9a707f20daa0860205df5d5ec9c24edb75e4cdefb82fa8b20eaada8c98a7b9a7123
-MISC ChangeLog 87738 SHA256 7c9b82c216ba576ca91a317cf9167052df3b8aba12b4b46520d5f1d2ee551efd SHA512 c53b62645d1c172b46d720a44654617de4ffd8ec0c6a782607c7271adcd57d57dd22d6ce68e0b230d5f852440a6c15a3bfd5ab565d04594f01a7075ce38b5bf9 WHIRLPOOL 0582a7edfe3ca53ba0c882c281a951ff8a92d56183b000fc77619bec56070aa5cb663c97f0bb91320edff3e87d406949b59e77741a537d3f18970322243c45c1
+MISC ChangeLog 87868 SHA256 ba5b0d1bd04a1c8b945cfff4f1fcd61f919e1e771006cc59ca2c1c76d9101158 SHA512 07063418a5bc1f12dd40f62b633a187f27f3ed3b8d024f77cdc60d5ccc0df11dc902baa0c5636927c2c9a59ff185b65db18c74d24ec02238bf00c7a100e4423b WHIRLPOOL 4df0a7cfc5f06db5bc424618954bf1e16adce5cc701b52897436f51153f5c3db4db9cf793904e3c920dbeae0e4413d5b6788113ff2b83a4b3de6c9b928f44e04
 MISC metadata.xml 1630 SHA256 ed398aadab7a4bb58e2dfe8af77dd1d9441a218046b06a9bb43007e427cd2a16 SHA512 53d436acb0a32757c2159e430f9c80cab8ef781fc164a98bfdcd3d443b091104a18b7f6f6dc70c8eddda9c89984f62b347b337abe200315bf6139acddd757fd2 WHIRLPOOL f297887b3f607d6ca953019557e2c34ff5253423e18e884309bbe8e73c33a0f307c80ea9a327dda8a892ebe72b4d992dbefd2eae21e9e5ac876c95a553b57f0e
diff --git a/net-fs/samba/samba-3.5.18.ebuild b/net-fs/samba/samba-3.5.18.ebuild
new file mode 100644
index 000000000000..d77f58d90121
--- /dev/null
+++ b/net-fs/samba/samba-3.5.18.ebuild
@@ -0,0 +1,455 @@
+# 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-3.5.18.ebuild,v 1.1 2012/10/17 22:05:43 vostorga 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/${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 +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 )
+	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"
+}