--- a/net-fs/samba/samba-3.3.1.ebuild	Sat Mar 07 08:15:02 2009 +0100
+++ b/net-fs/samba/samba-3.3.1.ebuild	Mon Mar 09 21:07:16 2009 +0100
@@ -71,10 +71,6 @@
 	local mylangs
 	local mymod_shared
 
-	mylangs="--with-manpages-langs=en"
-	use linguas_ja && mylangs="${mylangs},ja"
-	use linguas_pl && mylangs="${mylangs},pl"
-
 	use winbind && mymod_shared="--with-shared-modules=idmap_rid"
 	if use ldap ; then
 		myconf="${myconf} $(use_with ads)"
@@ -98,7 +94,7 @@
 		--sysconfdir=/etc/samba \
 		--localstatedir=/var \
 		--with-configdir=/etc/samba \
-		--with-libdir=/usr/$(get_libdir)/samba \
+		--with-modulesdir=/usr/$(get_libdir)/samba \
 		--with-pammodulesdir=$(getpam_mod_dir) \
 		--with-swatdir=/usr/share/doc/${PF}/swat \
 		--with-piddir=/var/run/samba \
@@ -106,7 +102,6 @@
 		--with-logfilebase=/var/log/samba \
 		--with-privatedir=${PRIVATE_DST} \
 		--with-libsmbclient \
-		--without-spinlocks \
 		--enable-socket-wrapper \
 		--enable-nss-wrapper \
 		--with-cifsmount=no \