Bump of 3.5

Package-Manager: portage-2.2.0_alpha161/cvs/Linux x86_64

3 files changed, 465 insertions, 22 deletions

diff --git a/net-fs/samba/ChangeLog b/net-fs/samba/ChangeLog
index 803b27c51690..f92ad4b21b0f 100644
--- a/net-fs/samba/ChangeLog
+++ b/net-fs/samba/ChangeLog
@@ -1,6 +1,11 @@
 # 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.554 2013/01/29 09:56:47 polynomial-c Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-fs/samba/ChangeLog,v 1.555 2013/01/31 07:29:53 patrick Exp $
+
+*samba-3.5.21 (31 Jan 2013)
+
+  31 Jan 2013; Patrick Lauer <patrick@gentoo.org> +samba-3.5.21.ebuild:
+  Bump of 3.5
 
 *samba-3.6.11 (29 Jan 2013)
 
diff --git a/net-fs/samba/Manifest b/net-fs/samba/Manifest
index 7476afba67b0..54cb5e6ccb4b 100644
--- a/net-fs/samba/Manifest
+++ b/net-fs/samba/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
-
 AUX 3.5/lmhosts 126 SHA256 f959c6e6b4179de24b2268c13b7cd8a8e400e43d0852f91dfb8dc8e48f56f80e SHA512 d9bc9c67b3f4bb128fee620550f46576a5554233bce2b2a0300645f6d60a40c25f88caf91057472b0cd1908c31d5494ce1c21a112535f91460cc97a75e0cfa69 WHIRLPOOL c691eb8df9272d5404a073e0507b16d7b8b6750af79090340733ebfb3428b1a106f6099cfb3c75e768da1e6adc2e6b89f4e7b9640144a5519a9cf8e6add321e1
 AUX 3.5/nsswitch.conf-winbind 406 SHA256 c6d461204201143f874f460df35f7fbb2345f93ed0d6c20b280c15864011e893 SHA512 15e42519630c8dc03fe5eed233c707be57290c79aa45085cde5dcaca2ea56ad9939bc981815f9fe832e4a8965cedcf61f451c9e89fe213b167af4a773b58a04d WHIRLPOOL afe807c64abcd1383872751d2cbed1e43a8f7c717a0b047022c890909484d9ab5559c0a260dcfa04313424bfcc0b64411a318f6f0a43975e846acffef2a49c63
 AUX 3.5/nsswitch.conf-wins 392 SHA256 3dbd18dc82371ef6f427dea1f626ee027d9d7be86036e2e10991f52f7041b5c8 SHA512 9cf4116d21531cb783af952ff891f0f70482aef10545f963efc9f86d281e7f03606b8607ef379bc257f51481f24aacc13ae44ad42048937d54caeae7e1f25db4 WHIRLPOOL a6ed5123aac2e125abbecbbbdf5897015aea9258258982a5b4fc585636d3810ee6cc4de0cdcfc2e9817d3a98178959771c95a40874e867de24c35a2f8fee8e5a
@@ -30,6 +27,7 @@ AUX samba4.initd 657 SHA256 4c8d1ecf42d58bfa1a2087ba9da55ed410ad238a0050272cb84c
 DIST samba-3.5.15.tar.gz 30368870 SHA256 c23c67c1212b7ff2e68a9e047a22200e1ad447d5ac1bd3cf24363f4b5875d396 SHA512 917864ba014a3180583bf8ce9d89a61c17e5d8b19256a603420481eaf69208600e0e525b9036570dabc1136b2dc0e125627b6f495ad4292f68c1722f6865cada WHIRLPOOL c02d16056baf0dff0783b6f8593e80cbe21144cbf26ef0c15a806ef6520d2d8d263a052e41eba2c66fee1dd47c0385eda119c356665fae2978dcb64accc44981
 DIST samba-3.5.19.tar.gz 35379330 SHA256 96f64f3869408b6eb28d776a2c31035dd8b9966f485889a7a056f7ac2ccece8b SHA512 dd0492b0a85b23025f5378178b6f8c654a72a72ea8ad8bfab50b14be6826496fab922d1015853cb0871929b2427b109bf2881af04d135c3aa73a26eba4c5a53a WHIRLPOOL 47d7312a3f58b20572a0bc0ac3018e402bcfe3e76f07f99b31c45cec80a557b6a99dbb8e7c3b210df3c8f304e3b284ba2263512293c9278f87610188c8783c49
 DIST samba-3.5.20.tar.gz 35377976 SHA256 e76d81d119dd587d9187368ba020514525ededbce19da3605ce7d9a1b130dc22 SHA512 3d169bca193b0e97fe626f6a4bd39f36d357c5d4ce9ac80888343a91121617327a7e895d5abfde1a4914fc8dd418192268b633e8b1ebccb3f1a90a52a60ff56c WHIRLPOOL 1ba033d8b2b3a3cf6247c1b52e3a50b8faa5b092d7658a7a77de15d93e3ed3cb03439a180f9659a041d331260110f5ae342ea741ad82ebec9384d53dcd08c88e
+DIST samba-3.5.21.tar.gz 35377315 SHA256 fd9a66056b1ba9496762394efff41fcaa0e58f2e50e71910e6d202b8a59a1c10 SHA512 e6d52530094b2f8284f8536f97411c3944a83e9f1a808836acdca19fe4aee3cc47e136cc2a2eab96ba89526fe289ec1a3d22fb836bd261bf7c8ddfbccd1cf975 WHIRLPOOL a476ea24841cfdec0f640880e0362173a3f6b957afd2d2448f7b4a8b7c927ef558fd22e7fe20b05bd8aecf1169d8e488b87830a99ddfddcbc8be0c9a414966ad
 DIST samba-3.6.10.tar.gz 34076720 SHA256 4af53840773b5768b620e8afb66e081b84f8639b1a0a92fb40e55ec8556fae74 SHA512 9600a9830b8d4d6735b48429fe4d056b97136d765ad6b1dfbc35cf828bbd19af6ec78d886ad8388140e9028a90c201a969edf33e4d79fd5c6ca1cc68448ffd2e WHIRLPOOL 0dba477bd4a17a908100308c38cdc5070e7156e10a877e0fda8a465773521787245ca9a4d2b4a41c2cb5563c71a30f7507ed37ae88707dd30be34d98c381086e
 DIST samba-3.6.11.tar.gz 34077337 SHA256 dcf01bc4af9c6a10c0b6c697a96a452598681d65a8894ca4843055a8b55b0020 SHA512 db064c96fb6fff167aec09acb38359892148b36bd88752f835e09d439b288ba8433fde5428bdaa4275ee95841e2e1bba28fd6bd8a6d44e48b2b4778f858312cd WHIRLPOOL 27585f344cfd1a2bd04bdafbfd8515503b316f02ea9c9fb40be02f118bcf7fdb10ba670eadc9f32322c0273b0938aebb8c35a21121e049a23df35a802c949b6c
 DIST samba-3.6.9.tar.gz 34077002 SHA256 9714b50c1bbdb0d3521bdbf403bb112b5405040685cb0b4ff3f9a370d1e84020 SHA512 be0c9d2a51a524015a1210d96c775c754101a2906dc054f3ecae97d18d4e0d50de2ac48a85af62a30d020259ff91068947831e44963925efe3cc48c8051a3be7 WHIRLPOOL 4e4f091329517872117160e167cb60ce71cfd441a0b6eb46157aa48b16369e887b7373b9c2bada8751de62db10f8db748f53ecc28a90b70aaf38df3af2649b1e
@@ -38,26 +36,10 @@ DIST smb_traffic_analyzer_v2.diff.bz2 12226 SHA256 1bae7eafbe8ac2382313d5ab9d43d
 EBUILD samba-3.5.15.ebuild 12458 SHA256 2837e33a487578958d53e1bb39762a7426d3b698392da6e63534502f6e9ec74f SHA512 24f10e3ad829d198ffaa7d00deb9692240688fe787827c1bea243e002ebc92f28b23d8c967d4701154dd19ca00d2bd5d5f7c8613bf667209395a29195ef44ce7 WHIRLPOOL 6638a9ad91fdd88152a3d3826d6efb1f1e4e486c472bc46a79a46c994a80e05ec4535915155b8314eb79d617aa0bfa82f49b7a73d5d5a5eee6a8d8753b81864b
 EBUILD samba-3.5.19.ebuild 12464 SHA256 936b24f5a5fe2d9fc7f0d5a7307395eef3e7fc0007cdd9b68f3ec7bc14c7ccf4 SHA512 03c4cb8cc9e73771753b39cf2fc1c2e350cd7c09bc08d0f3f0748d13769fadb0bb08a6855d8f27201412a6ab16cf32c2ce665a53d4d1714462de552ef66f6ab4 WHIRLPOOL b476ee0c7637cb43eb54541add97410c7ec2e5066d546aee7df40309d57978b63a5304a34fd779b448a530d8b0ada178e38eb4a8c43fe7aa4216ee6269e4ab78
 EBUILD samba-3.5.20.ebuild 12468 SHA256 bda45b3ad5516fd9e2637acba45b530804f8a665143b6abfb6745a819f593079 SHA512 3d513b46df51abfc56ff7edbdbb2af0b46b75046a5fe27cb769d98587cba0b68f4f520cb08f1e7cb9f8a44ffa39628c88540a80e52f0ffd681671740c7563603 WHIRLPOOL 2069d8a1254810c0834b9532df3c64a0828f2114bf67afc016a063708289bbca94f88294f47c506f2b4a97f1380b3cf71f7cacd380cea6a42349769d86bbc8a8
+EBUILD samba-3.5.21.ebuild 12463 SHA256 e30356ab462326bfdd955c4e1258ef91c3c7bf810bc4cc0bbf33441a5cb57be0 SHA512 934f36a32ebec4ffbd6c9ea8527bf2bccbacf6acf02368580cc26ec1b99b985aa4ea3d78de16d6a921b64ae23ee9bec08b5fe9ba6d0ca4c5951c6ab73f2b2472 WHIRLPOOL adad6bdd1a75fc7379c47fb3e9c3f588852fb9f8fdd6d04fd491ae208cde767bf0d2a11de21247bbfb6c5ca786df7cde7621197a1d76cf54f218eb1c7ffbccee
 EBUILD samba-3.6.10.ebuild 11865 SHA256 b240cb91156fa8c976e731b67f0b787c893504688a7cff1ce09c0a36908fea6f SHA512 a291afa5312560dc3ae8556ef73a3e6acacfa35ae37ab6912bb195a7a2a1f78360c8aeb263aa68288828c081bb7758d5201f1928d683af4c92a7da4f8b39019a WHIRLPOOL ad32f0b4009a051334ff384ad580e8b88ac26294896538d6a5ea3c08f437c8e4e790ca0698bd92dede389aa7970a7e3f8faada43566e9862bbab3ff20fe2706f
 EBUILD samba-3.6.11.ebuild 11865 SHA256 779aa21eaf90a721c5ec2b67fee1067e7dcf39671d85120eefaad7620b0e0ab6 SHA512 1198b54dfef2c346dd1f3d5a591537f0304076720ddf40e6afbc4d220aa858e71cc281b7ed70ec485c3b967868a1526b14931d322a31469a884182b518c67229 WHIRLPOOL f3c5943f0153634c9e14edc630fbc51afdcf56d4959cec04e2256bfb7350a3fff39bf8b6b4b73eeef92b3531e720b9e0d86bf479a1f98d91db2554f2f2285de7
 EBUILD samba-3.6.9.ebuild 11843 SHA256 c12e87494c00cbcc91ad1c6d427d6bc34ff86d77137882fd1101cad04e81a855 SHA512 84d4116f75f004d0dadbc143519eaa9174c5d0cceb606a7615c3eb192eb615dfaf9edfebb676a9a6d30e975ea48b8f1cfb118f07971a4676cc3ebf905e680ed4 WHIRLPOOL c69d7caa67ed25f4a62c3f28ba94c48cb5d251e7935ae559a6bffa88451cd9e9ce055628644a639bdd2f87c0e7334071ab2e82007c33f75cb832e06c9e378aec
 EBUILD samba-4.0.1.ebuild 3990 SHA256 4b067cd86fdaf4db4d80ab0e4a9fb356f23ca8508da455b538c8493832587556 SHA512 2afbd30b3164edb30e9cda167985dd66380352e088ccde2f1d57c9f3ccf649699f6b9df75f3126937ab4d0deab5b2a4e3717941084d4bd0c84461f551e7fee56 WHIRLPOOL 37db16ac12543cb3a7c6e688b3ef41ae38c45bb5805ced164bf24c49509d6be9c10e906b638657f751abb0ececbf1110ae3d6a7b18df31fe891c4539fe38fd17
-MISC ChangeLog 92054 SHA256 202950aaf9a9a921f13970fc9392d1970ccd20b1738050567a4f93fb83b42aec SHA512 3254ef3c16baa754cdc02375d8885cc065b79d52b70c5ae5d82ffe15ed95457791246240fc1f4614a5774e90b170769509305fbd98dc553c6158bb052bcd8705 WHIRLPOOL b218b4f77aafdc6650ab3cbbdf09b8738abfc77c1b5cd4436d4aa541c11fed26752296815d2a409dc167b8db64c9cc00eaf76d009bb5d569f05a7f38c49ca54f
+MISC ChangeLog 92165 SHA256 767ebf733912eca63d003cb2810d13580b84595ccfeb66591a8eb7046dc749e5 SHA512 724fa0f9257ba98a9c19bfea7ebdba79d6d214fba81ba717cf9c70f9805f9151af4547e5923770478ccdd978c874fd08470a9d3b6e4e0300a1ff6803e087e47a WHIRLPOOL 8f365667601a15a3a047c81b3e9b7798b36c6ecf2cbefd72e3901c94d05e801df2c9aac51a05c30659e713a8b53eeb7e8c92e2a200fe11b6b686657bac54c956
 MISC metadata.xml 1514 SHA256 c10deb71703017ec67f4e5bac297d9b4581fec3d8b5549b6aea2a43bda642bc0 SHA512 9e67e8f7e0c972046e32bf4539142559c24183d6c3469e5af2f901728a3c02a9fbfd50e948a9fd414107fd0cb2a8de709ffe3fc5bf3372c77a4a3db6dc622ecc WHIRLPOOL ec92ea6a1b03e70c791670e97e7d9e07e6bdb82c24ed08c186e786afcd009ab63fbee7d481a4cdc394632ad312e58a2048dae3ff333f6f7a1ad19add55e2c8f8
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
-
-iQIcBAEBCAAGBQJRB5zhAAoJEPiazRVxLXTFEGYQAN55Wb56gwnlsrjAenJq8m27
-lGUjEo9sLqmuFgaBqZM2i7Eos7EozJaHiFbgy+b+KDRrlaRy2RJbqLt/74usUA1s
-YDYttc6GSf0PNbG42WIBdUoX9UzWK49+yHr6dd3BsdW5bPhGFPu56056lcleyljI
-svRkA9gwiLPTp4Tb1U3Ag+LegCBkTxCtVWgaVLFk3E3QgCqB7LmiF4JuFC8fGjNg
-UHgiqqdGsS/SyoRQ0er5BZQQR0bg44jzerJpg0taHMMJe02IfBo3itUjJTOhkrsI
-IGFFJlssRbgX6Z/L7OhA/mHKefD/SXUrpV2r9YX5JfsqBg762slX3OtjIo1TKzW4
-VSYffBQeEZSW+6rTUgytnYcqUfqpQpOfOKQ1xIh8BgcK8EhNFOsEFqNfncRaB2Z+
-yYz9by+dGEN1udOuqqgT2JgDh64PQIIIQNYxxRr9DD0virWRe39JN5aWkLdqTewb
-wQdDawD0gBEPD1ciGO7As02YvoXj+GkRaARfzMeMNujtkFZWvNBuVkvVlqsJe9ym
-9Gv/fjI80WfG5SC91R4+YIJu4i3a2Mt5aDlBhCN7PMvmPWlD+llt+lYBgGMPSE9Q
-ZPyg7bDbvIfoTf49RBrdF7nphArXWOXG3GaQQnNFH0MnBY+H8GoE1CqucQsXBk63
-jd14+EbcdzXUKlazbwSA
-=7dZk
------END PGP SIGNATURE-----
diff --git a/net-fs/samba/samba-3.5.21.ebuild b/net-fs/samba/samba-3.5.21.ebuild
new file mode 100644
index 000000000000..cd05f3786f7a
--- /dev/null
+++ b/net-fs/samba/samba-3.5.21.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.21.ebuild,v 1.1 2013/01/31 07:29:53 patrick 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"
+}